File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -9,10 +9,11 @@ function getConfig(){
9
9
var config = defaultConfig ;
10
10
11
11
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 ;
13
14
}
14
15
15
- var protractorConfigFile = path . join ( config . rootDirectory , module . exports . config . protractorConfig || config . protractorConfig ) ;
16
+ var protractorConfigFile = path . join ( config . rootDirectory , config . protractorConfig ) ;
16
17
var protractorConfig = require ( protractorConfigFile ) . config ;
17
18
18
19
config . mocks = protractorConfig . mocks || defaultConfig . mocks ;
Original file line number Diff line number Diff line change @@ -48,4 +48,7 @@ describe('init data', function(){
48
48
globalMocks . teardown ( ) ;
49
49
defaultConfig . teardown ( ) ;
50
50
} ) ;
51
+ it ( 'will not error when not providing config' , function ( ) {
52
+ expect ( this . initData ) . not . toThrow ( ) ;
53
+ } ) ;
51
54
} ) ;
You can’t perform that action at this time.
0 commit comments