Instead of having tests run with the protractor runner need to require()

the protractor library, publish it to the global namespace. This insures
the instance of protractor used within the tests is the same as the
one used on the command line. Closes #36. Version bump for incompatible
API changes.

Author: juliemr

README.md

@@ -22,7 +22,7 @@ The example folder contains multiple versions of a simple test suite which runs
     jasmine-node example/onJasmineNodeSpec.js
     mocha example/onMocha.js
 
-You can also run the example suite using the Protractor runner. The runner accepts a configuration file, which runs the tests at `example/onProtractor.js`.
+You can also run the example suite using the Protractor runner. The runner accepts a configuration file, which runs the tests at `example/onProtractorRunner.js`.
 
     bin/protractor example/protractorConf.js
 

example/onProtractor.js example/onProtractorRunner.js

@@ -1,6 +1,4 @@
 var util = require('util');
-var protractor = require('../lib/protractor.js');
-require('../jasminewd');
 
 describe('angularjs homepage', function() {
   var ptor;

example/protractorConf.js

@@ -15,7 +15,7 @@ exports.config = {
 
   // Spec patterns are relative to the current working directly when
   // protractor is called.
-  specs: ['example/onProtractor.js'],
+  specs: ['example/onProtractorRunner.js'],
 
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {

lib/cli.js

@@ -132,6 +132,12 @@ var startJasmineTests = function() {
 
   protractor.setInstance(protractor.wrapDriver(driver, config.baseUrl));
 
+  // Export protractor to the global namespace to be used in tests.
+  global.protractor = protractor;
+
+  // Set up the Jasmine WebDriver Adapter
+  require('../jasminewd');
+
   var options = config.jasmineNodeOpts;
   options.onComplete = cleanUp;
 

package.json

@@ -33,5 +33,5 @@
   "scripts": {
     "test": "node lib/cli.js conf.js"
   },
-  "version": "0.6.2"
+  "version": "0.7.0"
 }

spec/findelements_spec.js

@@ -1,6 +1,4 @@
-var protractor = require('../lib/protractor.js');
 var util = require('util');
-require('../jasminewd');
 
 describe('finding elements', function() {
   var ptor;

spec/lib_spec.js

@@ -1,6 +1,4 @@
-var protractor = require('../lib/protractor.js');
 var util = require('util');
-require('../jasminewd');
 
 describe('no ptor at all', function() {
   it('should still do normal tests', function() {

spec/mockmodule_spec.js

@@ -1,6 +1,4 @@
-var protractor = require('../lib/protractor.js');
 var util = require('util');
-require('../jasminewd');
 
 describe('mock modules', function() {
   var ptor = protractor.getInstance();

spec/synchronize_spec.js

@@ -1,6 +1,4 @@
-var protractor = require('../lib/protractor.js');
 var util = require('util');
-require('../jasminewd');
 
 describe('synchronizing with slow pages', function() {
   var ptor = protractor.getInstance();

spec/testapp_spec.js

@@ -1,7 +1,4 @@
-var protractor = require('../lib/protractor.js');
 var util = require('util');
-require('../jasminewd');
-
 
 describe('longer example', function() {
   var ptor = protractor.getInstance();
@@ -63,5 +60,3 @@ describe('longer example', function() {
     });
   });
 });
-
-