Skip to content
This repository was archived by the owner on Apr 3, 2024. It is now read-only.

Commit 1e8e6bc

Browse files
ofrobotsofrobots
authored
test: reduce dependence on repo layout (#227)
1 parent daf015f commit 1e8e6bc

10 files changed

+30
-30
lines changed

‎test/fixtures/source-context.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎test/test-debuglet.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var assert = require('assert');
1919
var defaultConfig = require('../src/agent/config.js');
2020
var Debuglet = require('../src/agent/debuglet.js');
2121
var extend = require('extend');
22-
var path = require('path');
2322

2423
var DEBUGGEE_ID = 'bar';
2524
var API = 'https://clouddebugger.googleapis.com';
@@ -309,10 +308,14 @@ describe('Debuglet', function() {
309308

310309

311310
it('should pass source context to api if present', function(done) {
312-
process.chdir(path.join(__dirname, 'fixtures'));
313-
314311
var debug = require('..')(
315312
{projectId: 'fake-project', credentials: fakeCredentials});
313+
var old = Debuglet.prototype.getSourceContext_;
314+
Debuglet.prototype.getSourceContext_ = function(cb) {
315+
setImmediate(function () {
316+
cb(null, {a: 5});
317+
});
318+
};
316319
var debuglet = new Debuglet(debug, defaultConfig);
317320

318321
var scope = nock(API).post(REGISTER_PATH, function(body) {
@@ -321,10 +324,10 @@ describe('Debuglet', function() {
321324
}).reply(200, {debuggee: {id: DEBUGGEE_ID}});
322325

323326
debuglet.once('registered', function(id) {
327+
Debuglet.prototype.getSourceContext_ = old;
324328
assert.equal(id, DEBUGGEE_ID);
325329
debuglet.stop();
326330
scope.done();
327-
process.chdir('../..');
328331
done();
329332
});
330333

‎test/test-duplicate-expressions.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ var common = require('@google-cloud/common');
3333
var defaultConfig = require('../src/agent/config.js');
3434
var SourceMapper = require('../src/agent/sourcemapper.js');
3535
var scanner = require('../src/agent/scanner.js');
36-
var path = require('path');
3736

3837
function stateIsClean(api) {
3938
assert.equal(api.numBreakpoints_(), 0,
@@ -43,9 +42,9 @@ function stateIsClean(api) {
4342
return true;
4443
}
4544

46-
describe('v8debugapi', function() {
45+
describe(__filename, function() {
4746
var config = extend({}, defaultConfig, {
48-
workingDirectory: path.join(process.cwd(), 'test'),
47+
workingDirectory: __dirname,
4948
forceNewAgent_: true
5049
});
5150
var logger = common.logger({ logLevel: config.logLevel });

‎test/test-duplicate-nested-expressions.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var common = require('@google-cloud/common');
3131
var defaultConfig = require('../src/agent/config.js');
3232
var SourceMapper = require('../src/agent/sourcemapper.js');
3333
var scanner = require('../src/agent/scanner.js');
34-
var path = require('path');
3534
var semver = require('semver');
3635

3736
function stateIsClean(api) {
@@ -42,9 +41,9 @@ function stateIsClean(api) {
4241
return true;
4342
}
4443

45-
describe('v8debugapi', function() {
44+
describe(__filename, function() {
4645
var config = extend({}, defaultConfig, {
47-
workingDirectory: path.join(process.cwd(), 'test'),
46+
workingDirectory: __dirname,
4847
forceNewAgent_: true
4948
});
5049
var logger = common.logger({ logLevel: config.logLevel });

‎test/test-env-relative-repository-path.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,23 @@ var path = require('path');
2121
process.env.GCLOUD_PROJECT = 0;
2222

2323
var assert = require('assert');
24-
var agent = require('..')();
2524
var api;
25+
var Debuglet = require('../src/agent/debuglet.js');
26+
var debuglet;
2627
var h = require('./fixtures/a/hello.js');
2728

2829
describe('repository relative paths', function() {
2930

3031
before(function(done) {
31-
agent.startAgent({
32+
var debug = require('..')({projectId: 'fake-project'});
33+
var config = {
3234
appPathRelativeToRepository: path.join(path.sep, 'my', 'project', 'root')
33-
});
35+
};
36+
debuglet = new Debuglet(debug, config);
37+
debuglet.start();
3438
setTimeout(function() {
3539
// Wait for v8debug api to initialize.
36-
api = agent.private_.v8debug_;
40+
api = debuglet.v8debug_;
3741
assert(api, 'v8 debug api was not initialized in time');
3842
done();
3943
}, 1500);
@@ -44,15 +48,16 @@ describe('repository relative paths', function() {
4448
'there should be no breakpoints active');
4549
assert.equal(api.numListeners_(), 0,
4650
'there should be no listeners active');
51+
debuglet.stop();
4752
});
4853

4954
it('should correctly substitute when provided', function(done) {
5055
var bp = {
5156
id: 0,
5257
location: {
5358
line: 3,
54-
path: path.join(path.sep, 'my', 'project', 'root', 'test',
55-
'fixtures', 'a', 'hello.js')
59+
path: path.join(path.sep, 'my', 'project', 'root', 'packages', 'debug',
60+
'test', 'fixtures', 'a', 'hello.js')
5661
}
5762
};
5863
api.set(bp, function(err) {

‎test/test-fat-arrow.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ var common = require('@google-cloud/common');
2222
var defaultConfig = require('../src/agent/config.js');
2323
var SourceMapper = require('../src/agent/sourcemapper.js');
2424
var scanner = require('../src/agent/scanner.js');
25-
var path = require('path');
2625
var semver = require('semver');
2726

2827
process.env.GCLOUD_PROJECT = 0;
@@ -35,9 +34,9 @@ function stateIsClean(api) {
3534
return true;
3635
}
3736

38-
describe('v8debugapi', function() {
37+
describe(__filename, function() {
3938
var config = extend({}, defaultConfig, {
40-
workingDirectory: path.join(process.cwd(), 'test'),
39+
workingDirectory: __dirname,
4140
forceNewAgent_: true
4241
});
4342
var logger = common.logger({ logLevel: config.logLevel });

‎test/test-options-credentials.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('test-options-credentials', function() {
4646
var credentials = require('./fixtures/gcloud-credentials.json');
4747
var options = extend({}, {
4848
projectId: 'fake-project',
49-
keyFilename: path.join('test', 'fixtures', 'gcloud-credentials.json')
49+
keyFilename: path.join(__dirname, 'fixtures', 'gcloud-credentials.json')
5050
});
5151
var debug = require('..')(options);
5252
var scope = nocks.oauth2(function(body) {

‎test/test-sourcemapper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function testTool(tool, mapFilePath, inputFilePath, outputFilePath, inToOutLineN
9090
});
9191
}
9292

93-
var basePath = 'test/fixtures/sourcemapper/';
93+
var basePath = path.join(__dirname, 'fixtures', 'sourcemapper');
9494
testTool('Babel',
9595
path.join(basePath, 'babel', 'out.js.map'),
9696
path.join(basePath, 'babel', 'in.js'),

‎test/test-this-context.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var common = require('@google-cloud/common');
3131
var defaultConfig = require('../src/agent/config.js');
3232
var SourceMapper = require('../src/agent/sourcemapper.js');
3333
var scanner = require('../src/agent/scanner.js');
34-
var path = require('path');
3534
var semver = require('semver');
3635

3736
function stateIsClean(api) {
@@ -42,9 +41,9 @@ function stateIsClean(api) {
4241
return true;
4342
}
4443

45-
describe('v8debugapi', function() {
44+
describe(__filename, function() {
4645
var config = extend({}, defaultConfig, {
47-
workingDirectory: path.join(process.cwd(), 'test'),
46+
workingDirectory: __dirname,
4847
forceNewAgent_: true
4948
});
5049
var logger = common.logger({ logLevel: config.logLevel });

‎test/test-try-catch.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var common = require('@google-cloud/common');
3131
var defaultConfig = require('../src/agent/config.js');
3232
var SourceMapper = require('../src/agent/sourcemapper.js');
3333
var scanner = require('../src/agent/scanner.js');
34-
var path = require('path');
3534
var semver = require('semver');
3635

3736
function stateIsClean(api) {
@@ -42,9 +41,9 @@ function stateIsClean(api) {
4241
return true;
4342
}
4443

45-
describe('v8debugapi', function() {
44+
describe(__filename, function() {
4645
var config = extend({}, defaultConfig, {
47-
workingDirectory: path.join(process.cwd(), 'test'),
46+
workingDirectory: __dirname,
4847
forceNewAgent_: true
4948
});
5049
var logger = common.logger({ logLevel: config.logLevel });

0 commit comments

Comments
 (0)