Change the way paths are resolved in config files - now paths are

juliemr · juliemr · commit a54abfbbfd3b · 2013-08-28T21:21:01.000-07:00
resolved relative to the location of the config file as opposed to the
working directory when the code is called. This is consistent with
other test runners are just makes more sense.
diff --git a/debugging/failure_conf.js b/debugging/failure_conf.js
@@ -7,7 +7,7 @@ exports.config = {
   // Spec patterns are relative to the current working directly when
   // protractor is called.
   specs: [
-    'debugging/failure_spec.js',
+    'failure_spec.js',
   ],
 
   capabilities: {
diff --git a/debugging/timeout_conf.js b/debugging/timeout_conf.js
@@ -7,7 +7,7 @@ exports.config = {
   // Spec patterns are relative to the current working directly when
   // protractor is called.
   specs: [
-    'debugging/timeout_spec.js',
+    'timeout_spec.js',
   ],
 
   capabilities: {
diff --git a/example/protractorConf.js b/example/protractorConf.js
@@ -10,7 +10,7 @@ exports.config = {
 
   // Spec patterns are relative to the current working directly when
   // protractor is called.
-  specs: ['example/onProtractorRunner.js'],
+  specs: ['onProtractorRunner.js'],
 
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {
diff --git a/lib/cli.js b/lib/cli.js
@@ -9,6 +9,7 @@ var SauceLabs = require('saucelabs');
 var glob = require('glob');
 
 var args = process.argv.slice(2);
+var configDir;
 
 // Default configuration.
 var config = {
@@ -76,12 +77,12 @@ var run = function() {
   var specs = config.specs;
   var resolvedSpecs = [];
   for (var i = 0; i < specs.length; ++i) {
-    var matches = glob.sync(specs[i]);
+    var matches = glob.sync(specs[i], {cwd: configDir});
     if (!matches.length) {
       throw new Error('Test file ' + specs[i] + ' did not match any files.');
     }
     for (var j = 0; j < matches.length; ++j) {
-      resolvedSpecs.push(matches[j]);
+      resolvedSpecs.push(path.join(configDir, matches[j]));
     }
   }
   minijn.addSpecs(resolvedSpecs);
@@ -185,7 +186,9 @@ while(args.length) {
       config.seleniumPort = args.shift();
       break;
     default:
-      config = require(path.resolve(process.cwd(), arg)).config;
+      var configPath = path.resolve(process.cwd(), arg);
+      config = require(configPath).config;
+      configDir = path.dirname(configPath);
       break;
   }
 }
diff --git a/referenceConf.js b/referenceConf.js
@@ -35,8 +35,7 @@ exports.config = {
 
   // ----- What tests to run -----
   //
-  // Spec patterns are relative to the current working directly when
-  // protractor is called.
+  // Spec patterns are relative to the location of this config.
   specs: [
     'spec/*_spec.js',
   ],
@@ -56,7 +55,7 @@ exports.config = {
   baseUrl: 'http://localhost:8000',
 
   // Selector for the element housing the angular app - this defaults to
-  // body, but is necessary if ng-app is on a descendant of <body>
+  // body, but is necessary if ng-app is on a descendant of <body>  
   rootElement: 'body',
 
   // ----- Options to be passed to minijasminenode -----
diff --git a/spec/altRootConf.js b/spec/altRootConf.js
@@ -5,10 +5,9 @@ exports.config = {
 
   seleniumAddress: 'http://localhost:4444/wd/hub',
 
-  // Spec patterns are relative to the current working directly when
-  // protractor is called.
+  // Spec patterns are relative to this config.
   specs: [
-    'spec/altRoot/*_spec.js',
+    'altRoot/*_spec.js',
   ],
 
   capabilities: {
diff --git a/spec/basicConf.js b/spec/basicConf.js
@@ -5,10 +5,9 @@ exports.config = {
 
   seleniumAddress: 'http://localhost:4444/wd/hub',
 
-  // Spec patterns are relative to the current working directly when
-  // protractor is called.
+  // Spec patterns are relative to this directory.
   specs: [
-    'spec/*_spec.js',
+    '*_spec.js',
   ],
 
   capabilities: {
