feat(frameworks): add jasmine2 framework

docs/referenceConf.js

@@ -236,7 +236,7 @@ exports.config = {
   // ----- The test framework --------------------------------------------------
   // ---------------------------------------------------------------------------
 
-  // Test framework to use. This may be jasmine, cucumber, or mocha.
+  // Test framework to use. This may be jasmine, jasmine2, cucumber, or mocha.
   //
   // Jasmine is fully supported as a test and assertion framework.
   // Mocha and Cucumber have limited beta support. You will need to include your
@@ -257,6 +257,18 @@ exports.config = {
     defaultTimeoutInterval: 30000
   },
 
+  // Options to be passed to jasmine2.
+  //
+  // See the full list at https://github.com/jasmine/jasmine-npm
+  jasmineNodeOpts: {
+    // If true, print colors to the terminal.
+    showColors: true,
+    // Default time to wait in ms before a test fails.
+    defaultTimeoutInterval: 30000,
+    // Function called to print jasmine results
+    print: function() {},
+  },
+
   // Options to be passed to Mocha.
   //
   // See the full list at http://visionmedia.github.io/mocha/

lib/frameworks/jasmine2.js

@@ -0,0 +1,95 @@
+var q = require('q');
+
+var RunnerReporter = function(emitter) {
+  this.emitter = emitter;
+  this.testResult = [],
+  this.failedCount = 0;
+};
+
+RunnerReporter.prototype.jasmineStarted = function() {
+  // Need to initiate startTime here, in case reportSpecStarting is not
+  // called (e.g. when fit is used)
+  this.startTime = new Date();
+};
+
+RunnerReporter.prototype.specStarted = function() {
+  this.startTime = new Date();
+};
+
+RunnerReporter.prototype.specDone = function(result) {
+  if (result.status == 'passed') {
+    this.emitter.emit('testPass');
+  } else if (result.status == 'failed') {
+    this.emitter.emit('testFail');
+    this.failedCount++;
+  }
+
+  var entry = {
+    description: result.description,
+    assertions: [],
+    duration: new Date().getTime() - this.startTime.getTime()
+  };
+
+  result.failedExpectations.forEach(function(item) {
+    entry.assertions.push({
+      passed: item.passed,
+      errorMsg: item.passed ? undefined : item.message,
+      stackTrace: item.passed ? undefined : item.stack
+    });
+  });
+  this.testResult.push(entry);
+};
+
+/**
+ * Execute the Runner's test cases through Jasmine.
+ *
+ * @param {Runner} runner The current Protractor Runner.
+ * @param {Array} specs Array of Directory Path Strings.
+ * @return {q.Promise} Promise resolved with the test results
+ */
+exports.run = function(runner, specs) {
+  var JasmineRunner = require('jasmine');
+  var jrunner = new JasmineRunner();
+  /* global jasmine */
+
+  require('jasminewd2');
+
+  // On timeout, the flow should be reset. This will prevent webdriver tasks
+  // from overflowing into the next test and causing it to fail or timeout
+  // as well. This is done in the reporter instead of an afterEach block
+  // to ensure that it runs after any afterEach() blocks with webdriver tasks
+  // get to complete first.
+  var reporter = new RunnerReporter(runner); 
+  jasmine.getEnv().addReporter(reporter);
+
+  return runner.runTestPreparer().then(function() {
+    return q.promise(function (resolve, reject) {
+      var jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
+
+      if (jasmineNodeOpts && jasmineNodeOpts.defaultTimeoutInterval) {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineNodeOpts.defaultTimeoutInterval;
+      }
+
+      var originalOnComplete = runner.getConfig().onComplete;
+      jasmineNodeOpts.onComplete = function(passed) {
+        try {
+          if (originalOnComplete) {
+            originalOnComplete(passed);
+          }
+          resolve({
+            failedCount: reporter.failedCount,
+            specResults: reporter.testResult
+          });
+        } catch(err) {
+          reject(err);
+        }
+      };
+
+      jrunner.configureDefaultReporter(jasmineNodeOpts);
+      jrunner.projectBaseDir = '';
+      jrunner.specDir = '';
+      jrunner.addSpecFiles(specs);
+      jrunner.execute();
+    });
+  });
+};

lib/runner.js

@@ -263,6 +263,8 @@ Runner.prototype.run = function() {
     var frameworkPath = '';
     if (self.config_.framework === 'jasmine') {
       frameworkPath = './frameworks/jasmine.js';
+    } else if (self.config_.framework === 'jasmine2') {
+      frameworkPath = './frameworks/jasmine2.js';
     } else if (self.config_.framework === 'mocha') {
       frameworkPath = './frameworks/mocha.js';
     } else if (self.config_.framework === 'cucumber') {

package.json

@@ -16,6 +16,8 @@
     "selenium-webdriver": "2.44.0",
     "minijasminenode": "1.1.1",
     "jasminewd": "1.1.0",
+    "jasminewd2": "0.0.2",
+    "jasmine": "2.1.1",
     "saucelabs": "~0.1.0",
     "glob": "~3.2",
     "adm-zip": "0.4.4",

scripts/test.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 var Executor = require('./test/test_util').Executor;
-var glob = require('glob').sync;
 
 var passingTests = [
   'node lib/cli.js spec/basicConf.js',
@@ -26,14 +25,10 @@ var passingTests = [
   'node lib/cli.js spec/interactionConf.js',
   'node lib/cli.js spec/directConnectConf.js',
   'node lib/cli.js spec/restartBrowserBetweenTestsConf.js',
-  'node lib/cli.js spec/getCapabilitiesConf.js'
+  'node lib/cli.js spec/getCapabilitiesConf.js',
+  'node node_modules/.bin/jasmine JASMINE_CONFIG_PATH=scripts/unit_test.json'
 ];
 
-passingTests.push(
-  'node node_modules/minijasminenode/bin/minijn ' +
-  glob('spec/unit/*.js').join(' ') + ' ' +
-  glob('website/docgen/spec/*.js').join(' '));
-
 var executor = new Executor();
 
 passingTests.forEach(function(passing_test) {
@@ -56,7 +51,8 @@ executor.addCommandlineTest('node lib/cli.js spec/errorTest/singleFailureConf.js
 executor.addCommandlineTest('node lib/cli.js spec/errorTest/timeoutConf.js')
     .expectExitCode(1)
     .expectErrors({
-      message: 'timeout: timed out after 1 msec waiting for spec to complete'
+      message: 'Timeout - Async callback was not invoked within timeout ' +
+          'specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.'
     })
     .expectTestDuration(0, 100);
 

scripts/unit_test.json

@@ -0,0 +1,7 @@
+{
+  "spec_dir": "",
+  "spec_files": [
+    "spec/unit/*.js",
+    "website/docgen/spec/*.js"
+  ]
+}

spec/altRootConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this config.
   specs: [
     'altRoot/*_spec.js',

spec/basic/locators_spec.js

@@ -12,10 +12,16 @@ describe('locators', function() {
 
     it('should allow custom expectations to expect an element', function() {
       this.addMatchers({
-        toHaveText: function(actualText) {
-          return this.actual.getText().then(function(expectedText) {
-            return expectedText === actualText;
-          });
+        toHaveText: function() {
+          return {
+            compare: function(actual, expected) {
+              return {
+                pass: actual.getText().then(function(actual) {
+                  return actual === expected;
+                })
+              };
+            }
+          };
         }
       });
 

spec/basicConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'basic/*_spec.js'

spec/ciConf.js

@@ -5,6 +5,8 @@ exports.config = {
   sauceUser: process.env.SAUCE_USERNAME,
   sauceKey: process.env.SAUCE_ACCESS_KEY,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'basic/*_spec.js'

spec/directConnectConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   directConnect: true,
 
+  framework: 'jasmine2',
+
   capabilities: {
     'browserName': 'chrome'
   },

spec/errorTest/afterLaunchChangesExitCodeConf.js

@@ -3,6 +3,8 @@ var env = require('../environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'baseCase/single_failure_spec1.js'
   ],

spec/errorTest/multiFailureConf.js

@@ -3,6 +3,8 @@ var env = require('../environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'baseCase/single_failure_spec1.js',
     'baseCase/single_failure_spec2.js'

spec/errorTest/shardedFailureConf.js

@@ -3,6 +3,8 @@ var env = require('../environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'baseCase/single_failure_spec1.js',
     'baseCase/single_failure_spec2.js'

spec/errorTest/singleFailureConf.js

@@ -3,6 +3,8 @@ var env = require('../environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'baseCase/single_failure_spec1.js'
   ],

spec/errorTest/timeoutConf.js

@@ -3,6 +3,8 @@ var env = require('../environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'baseCase/timeout_spec.js'
   ],

spec/interactionConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'interaction/*_spec.js'

spec/junitOutputConf.js

@@ -8,6 +8,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'basic/*_spec.js'
   ],

spec/multiConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'basic/lib_spec.js'

spec/ngHintFailConfig.js

@@ -2,6 +2,7 @@ var env = require('./environment.js');
 
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  framework: 'jasmine2',
   specs: ['ngHint/fail_spec.js'],
   baseUrl: env.baseUrl,
   plugins: [{

spec/ngHintSuccessConfig.js

@@ -2,6 +2,7 @@ var env = require('./environment.js');
 
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  framework: 'jasmine2',
   specs: ['ngHint/success_spec.js'],
   baseUrl: env.baseUrl,
   plugins: [{

spec/onCleanUpAsyncReturnValueConf.js

@@ -5,6 +5,8 @@ var q = require('q');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'onCleanUp/*_spec.js'
   ],

spec/onCleanUpNoReturnValueConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'onCleanUp/*_spec.js'
   ],

spec/onCleanUpSyncReturnValueConf.js

@@ -4,6 +4,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'onCleanUp/*_spec.js'
   ],

spec/onPrepareConf.js

@@ -6,6 +6,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'onPrepare/*_spec.js'
   ],

spec/onPrepareFileConf.js

@@ -5,6 +5,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'onPrepare/*_spec.js'

spec/onPreparePromiseConf.js

@@ -7,6 +7,8 @@ var q = require('q');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   specs: [
     'onPrepare/*_spec.js'
   ],

spec/onPreparePromiseFileConf.js

@@ -5,6 +5,8 @@ var env = require('./environment.js');
 exports.config = {
   seleniumAddress: env.seleniumAddress,
 
+  framework: 'jasmine2',
+
   // Spec patterns are relative to this directory.
   specs: [
     'onPrepare/*_spec.js'