Skip to content

Commit d7575e6

Browse files
committed
Fix errors when calling initData without config
1 parent e8afdbb commit d7575e6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

lib/initData.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ function getConfig(){
99
var config = defaultConfig;
1010

1111
if(module.exports.config){
12-
config.rootDirectory = module.exports.config.rootDirectory || config.module.rootDirectory;
12+
config.rootDirectory = module.exports.config.rootDirectory || config.rootDirectory;
13+
config.protractorConfig = module.exports.config.protractorConfig || config.protractorConfig;
1314
}
1415

15-
var protractorConfigFile = path.join(config.rootDirectory, module.exports.config.protractorConfig || config.protractorConfig);
16+
var protractorConfigFile = path.join(config.rootDirectory, config.protractorConfig);
1617
var protractorConfig = require(protractorConfigFile).config;
1718

1819
config.mocks = protractorConfig.mocks || defaultConfig.mocks;

specs/initData.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,7 @@ describe('init data', function(){
4848
globalMocks.teardown();
4949
defaultConfig.teardown();
5050
});
51+
it('will not error when not providing config', function () {
52+
expect(this.initData).not.toThrow();
53+
});
5154
});

0 commit comments

Comments
 (0)