From c44fc94319a57b3cfb25884df102b3a241f5681d Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@gmail.com>
Date: Wed, 15 Feb 2017 14:20:02 +0100
Subject: [PATCH 1/3] fix(ngScenario): completely remove the angular scenario
 runner

The runner has been deprecated and undocumented since 2014:
See commit 8d6d126899d4b1927360599403a7592011243270

Closes #9405

BREAKING CHANGE:

The angular scenario runner end-to-end test framework has been
removed from the project and will no longer be available on npm
or bower starting with 1.7.0.
It was deprecated and removed from the documentation in 2014.
Applications that still use it should migrate to
[Protractor](http://www.protractortest.org).
Technically, it should also be possible to continue using an
older version of the scenario runner, as the underlying APIs have
not changed. However, we do not guarantee future compatibility.
---
 Gruntfile.js                             |  12 -
 angularFiles.js                          |  27 -
 package.json                             |   1 -
 src/ngScenario/.eslintrc.json            |  15 -
 src/ngScenario/Application.js            | 142 ----
 src/ngScenario/Describe.js               | 155 -----
 src/ngScenario/Future.js                 |  64 --
 src/ngScenario/ObjectModel.js            | 252 --------
 src/ngScenario/Runner.js                 | 229 -------
 src/ngScenario/Scenario.js               | 329 ----------
 src/ngScenario/SpecRunner.js             | 149 -----
 src/ngScenario/angular-bootstrap.js      |  60 --
 src/ngScenario/angular.prefix            |   7 -
 src/ngScenario/angular.suffix            |  22 -
 src/ngScenario/dsl.js                    | 484 --------------
 src/ngScenario/matchers.js               |  45 --
 src/ngScenario/output/Html.js            | 171 -----
 src/ngScenario/output/Json.js            |  10 -
 src/ngScenario/output/Object.js          |   8 -
 src/ngScenario/output/Xml.js             |  54 --
 test/ng/directive/inputSpec.js           |   3 +-
 test/ngScenario/ApplicationSpec.js       | 244 -------
 test/ngScenario/DescribeSpec.js          | 123 ----
 test/ngScenario/FutureSpec.js            |  77 ---
 test/ngScenario/ObjectModelSpec.js       | 333 ----------
 test/ngScenario/RunnerSpec.js            | 116 ----
 test/ngScenario/ScenarioSpec.js          |  44 --
 test/ngScenario/SpecRunnerSpec.js        | 177 -----
 test/ngScenario/dslSpec.js               | 789 -----------------------
 test/ngScenario/e2e/.eslintrc.json       |   9 -
 test/ngScenario/e2e/Runner-compiled.html |   9 -
 test/ngScenario/e2e/Runner.html          |  10 -
 test/ngScenario/e2e/style.css            |  11 -
 test/ngScenario/e2e/widgets-scenario.js  |  69 --
 test/ngScenario/e2e/widgets.html         |  99 ---
 test/ngScenario/matchersSpec.js          |  51 --
 test/ngScenario/mocks.js                 |  33 -
 test/ngScenario/output/HtmlSpec.js       | 127 ----
 test/ngScenario/output/jsonSpec.js       |  37 --
 test/ngScenario/output/objectSpec.js     |  40 --
 test/ngScenario/output/xmlSpec.js        |  49 --
 yarn.lock                                |   4 -
 42 files changed, 1 insertion(+), 4689 deletions(-)
 delete mode 100644 src/ngScenario/.eslintrc.json
 delete mode 100644 src/ngScenario/Application.js
 delete mode 100644 src/ngScenario/Describe.js
 delete mode 100644 src/ngScenario/Future.js
 delete mode 100644 src/ngScenario/ObjectModel.js
 delete mode 100644 src/ngScenario/Runner.js
 delete mode 100644 src/ngScenario/Scenario.js
 delete mode 100644 src/ngScenario/SpecRunner.js
 delete mode 100644 src/ngScenario/angular-bootstrap.js
 delete mode 100644 src/ngScenario/angular.prefix
 delete mode 100644 src/ngScenario/angular.suffix
 delete mode 100644 src/ngScenario/dsl.js
 delete mode 100644 src/ngScenario/matchers.js
 delete mode 100644 src/ngScenario/output/Html.js
 delete mode 100644 src/ngScenario/output/Json.js
 delete mode 100644 src/ngScenario/output/Object.js
 delete mode 100644 src/ngScenario/output/Xml.js
 delete mode 100644 test/ngScenario/ApplicationSpec.js
 delete mode 100644 test/ngScenario/DescribeSpec.js
 delete mode 100644 test/ngScenario/FutureSpec.js
 delete mode 100644 test/ngScenario/ObjectModelSpec.js
 delete mode 100644 test/ngScenario/RunnerSpec.js
 delete mode 100644 test/ngScenario/ScenarioSpec.js
 delete mode 100644 test/ngScenario/SpecRunnerSpec.js
 delete mode 100644 test/ngScenario/dslSpec.js
 delete mode 100644 test/ngScenario/e2e/.eslintrc.json
 delete mode 100644 test/ngScenario/e2e/Runner-compiled.html
 delete mode 100644 test/ngScenario/e2e/Runner.html
 delete mode 100644 test/ngScenario/e2e/style.css
 delete mode 100644 test/ngScenario/e2e/widgets-scenario.js
 delete mode 100644 test/ngScenario/e2e/widgets.html
 delete mode 100644 test/ngScenario/matchersSpec.js
 delete mode 100644 test/ngScenario/mocks.js
 delete mode 100644 test/ngScenario/output/HtmlSpec.js
 delete mode 100644 test/ngScenario/output/jsonSpec.js
 delete mode 100644 test/ngScenario/output/objectSpec.js
 delete mode 100644 test/ngScenario/output/xmlSpec.js

diff --git a/Gruntfile.js b/Gruntfile.js
index ff5eb26de2a0..c9c32ca8d71a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -186,16 +186,6 @@ module.exports = function(grunt) {
     },
 
     build: {
-      scenario: {
-        dest: 'build/angular-scenario.js',
-        src: [
-          'bower_components/jquery/dist/jquery.js',
-          util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
-        ],
-        styles: {
-          css: ['css/angular.css', 'css/angular-scenario.css']
-        }
-      },
       angular: {
         dest: 'build/angular.js',
         src: util.wrap([files['angularSrc']], 'angular'),
@@ -281,9 +271,7 @@ module.exports = function(grunt) {
       files: [
         'src/**/*.js',
         'test/**/*.js',
-        '!test/ngScenario/DescribeSpec.js',
         '!src/ng/directive/attrs.js', // legitimate xit here
-        '!src/ngScenario/**/*.js',
         '!test/helpers/privateMocks*.js'
       ],
       options: {
diff --git a/angularFiles.js b/angularFiles.js
index 4c7b8cc361e4..7c4062d41ad4 100644
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -153,26 +153,8 @@ var angularFiles = {
     ]
   },
 
-  'angularScenario': [
-    'src/ngScenario/Scenario.js',
-    'src/ngScenario/Application.js',
-    'src/ngScenario/Describe.js',
-    'src/ngScenario/Future.js',
-    'src/ngScenario/ObjectModel.js',
-    'src/ngScenario/Runner.js',
-    'src/ngScenario/SpecRunner.js',
-    'src/ngScenario/dsl.js',
-    'src/ngScenario/matchers.js',
-    'src/ngScenario/output/Html.js',
-    'src/ngScenario/output/Json.js',
-    'src/ngScenario/output/Xml.js',
-    'src/ngScenario/output/Object.js'
-  ],
-
   'angularTest': [
     'test/helpers/*.js',
-    'test/ngScenario/*.js',
-    'test/ngScenario/output/*.js',
     'test/*.js',
     'test/auto/*.js',
     'test/ng/**/*.js',
@@ -193,22 +175,15 @@ var angularFiles = {
     'test/jquery_remove.js',
     '@angularSrc',
     '@angularSrcModules',
-    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',
-    'src/ngScenario/angular-bootstrap.js',
     'src/angular.bind.js'
   ],
 
-  'karmaScenario': [
-    'build/angular-scenario.js',
-    'build/docs/docs-scenario.js'
-  ],
-
   'karmaModules': [
     'build/angular.js',
     '@angularSrcModules',
@@ -231,13 +206,11 @@ var angularFiles = {
     'test/jquery_alias.js',
     '@angularSrc',
     '@angularSrcModules',
-    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaJqueryExclude': [
     'src/angular-bootstrap.js',
-    'src/ngScenario/angular-bootstrap.js',
     'test/jquery_remove.js',
     'src/angular.bind.js'
   ]
diff --git a/package.json b/package.json
index 6ca57a1193c5..86876028ed21 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
     "karma-firefox-launcher": "^1.0.1",
     "karma-jasmine": "^1.1.0",
     "karma-junit-reporter": "^1.2.0",
-    "karma-ng-scenario": "^1.0.0",
     "karma-sauce-launcher": "^1.2.0",
     "karma-script-launcher": "^1.0.0",
     "karma-spec-reporter": "^0.0.31",
diff --git a/src/ngScenario/.eslintrc.json b/src/ngScenario/.eslintrc.json
deleted file mode 100644
index 454d02348435..000000000000
--- a/src/ngScenario/.eslintrc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "globals": {
-    "includes": false,
-    "asyncForEach": false,
-    "msie": false,
-    "browserTrigger": false,
-    "console": false,
-    "alert": false,
-    "_jQuery": false,
-    "angularInit": false,
-    "formatException": false,
-    "$runner": false,
-    "callerFile": false
-  }
-}
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
deleted file mode 100644
index ec5d1626a6bd..000000000000
--- a/src/ngScenario/Application.js
+++ /dev/null
@@ -1,142 +0,0 @@
-'use strict';
-
-/**
- * Represents the application currently being tested and abstracts usage
- * of iframes or separate windows.
- *
- * @param {Object} context jQuery wrapper around HTML context.
- */
-angular.scenario.Application = function(context) {
-  this.context = context;
-  context.append(
-    '<h2>Current URL: <a href="about:blank">None</a></h2>' +
-    '<div id="test-frames"></div>'
-  );
-};
-
-/**
- * Gets the jQuery collection of frames. Don't use this directly because
- * frames may go stale.
- *
- * @private
- * @return {Object} jQuery collection
- */
-angular.scenario.Application.prototype.getFrame_ = function() {
-  return this.context.find('#test-frames iframe:last');
-};
-
-/**
- * Gets the window of the test runner frame. Always favor executeAction()
- * instead of this method since it prevents you from getting a stale window.
- *
- * @private
- * @return {Object} the window of the frame
- */
-angular.scenario.Application.prototype.getWindow_ = function() {
-  var contentWindow = this.getFrame_().prop('contentWindow');
-  if (!contentWindow) {
-    throw new Error('Frame window is not accessible.');
-  }
-  return contentWindow;
-};
-
-/**
- * Changes the location of the frame.
- *
- * @param {string} url The URL. If it begins with a # then only the
- *   hash of the page is changed.
- * @param {function()} loadFn function($window, $document) Called when frame loads.
- * @param {function()} errorFn function(error) Called if any error when loading.
- */
-angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorFn) {
-  var self = this;
-  var frame = self.getFrame_();
-  //TODO(esprehn): Refactor to use rethrow()
-  errorFn = errorFn || function(e) { throw e; };
-  if (url === 'about:blank') {
-    errorFn('Sandbox Error: Navigating to about:blank is not allowed.');
-  } else if (url.charAt(0) === '#') {
-    url = frame.attr('src').split('#')[0] + url;
-    frame.attr('src', url);
-    self.executeAction(loadFn);
-  } else {
-    frame.remove();
-    self.context.find('#test-frames').append('<iframe>');
-    frame = self.getFrame_();
-
-    frame.on('load', function() {
-      frame.off();
-      try {
-        var $window = self.getWindow_();
-
-        if (!$window.angular) {
-          self.executeAction(loadFn);
-          return;
-        }
-
-        if (!$window.angular.resumeBootstrap) {
-          $window.angular.resumeDeferredBootstrap = resumeDeferredBootstrap;
-        } else {
-          resumeDeferredBootstrap();
-        }
-
-      } catch (e) {
-        errorFn(e);
-      }
-
-      function resumeDeferredBootstrap() {
-        // Disable animations
-        var $injector = $window.angular.resumeBootstrap([['$provide', function($provide) {
-          return ['$animate', function($animate) {
-            $animate.enabled(false);
-          }];
-        }]]);
-        self.rootElement = $injector.get('$rootElement')[0];
-        self.executeAction(loadFn);
-      }
-    }).attr('src', url);
-
-    // for IE compatibility set the name *after* setting the frame url
-    frame[0].contentWindow.name = 'NG_DEFER_BOOTSTRAP!';
-  }
-  self.context.find('> h2 a').attr('href', url).text(url);
-};
-
-/**
- * Executes a function in the context of the tested application. Will wait
- * for all pending AngularJS xhr requests before executing.
- *
- * @param {function()} action The callback to execute. function($window, $document)
- *  $document is a jQuery wrapped document.
- */
-angular.scenario.Application.prototype.executeAction = function(action) {
-  var self = this;
-  var $window = this.getWindow_();
-  if (!$window.document) {
-    throw new Error('Sandbox Error: Application document not accessible.');
-  }
-  if (!$window.angular) {
-    return action.call(this, $window, _jQuery($window.document));
-  }
-
-  if (this.rootElement) {
-    executeWithElement(this.rootElement);
-  } else {
-    angularInit($window.document, angular.bind(this, executeWithElement));
-  }
-
-  function executeWithElement(element) {
-    var $injector = $window.angular.element(element).injector();
-    var $element = _jQuery(element);
-
-    $element.injector = function() {
-      return $injector;
-    };
-
-    $injector.invoke(function($browser) {
-      $browser.notifyWhenNoOutstandingRequests(function() {
-        action.call(self, $window, $element);
-      });
-    });
-  }
-};
diff --git a/src/ngScenario/Describe.js b/src/ngScenario/Describe.js
deleted file mode 100644
index e0c2b7385bcd..000000000000
--- a/src/ngScenario/Describe.js
+++ /dev/null
@@ -1,155 +0,0 @@
-'use strict';
-
-/**
- * The representation of define blocks. Don't used directly, instead use
- * define() in your tests.
- *
- * @param {string} descName Name of the block
- * @param {Object} parent describe or undefined if the root.
- */
-angular.scenario.Describe = function(descName, parent) {
-  this.only = parent && parent.only;
-  this.beforeEachFns = [];
-  this.afterEachFns = [];
-  this.its = [];
-  this.children = [];
-  this.name = descName;
-  this.parent = parent;
-  this.id = angular.scenario.Describe.id++;
-
-  /**
-   * Calls all before functions.
-   */
-  var beforeEachFns = this.beforeEachFns;
-  this.setupBefore = function() {
-    if (parent) parent.setupBefore.call(this);
-    angular.forEach(beforeEachFns, /** @this */ function(fn) { fn.call(this); }, this);
-  };
-
-  /**
-   * Calls all after functions.
-   */
-  var afterEachFns = this.afterEachFns;
-  this.setupAfter  = function() {
-    angular.forEach(afterEachFns, /** @this */ function(fn) { fn.call(this); }, this);
-    if (parent) parent.setupAfter.call(this);
-  };
-};
-
-// Shared Unique ID generator for every describe block
-angular.scenario.Describe.id = 0;
-
-// Shared Unique ID generator for every it (spec)
-angular.scenario.Describe.specId = 0;
-
-/**
- * Defines a block to execute before each it or nested describe.
- *
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.beforeEach = function(body) {
-  this.beforeEachFns.push(body);
-};
-
-/**
- * Defines a block to execute after each it or nested describe.
- *
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.afterEach = function(body) {
-  this.afterEachFns.push(body);
-};
-
-/**
- * Creates a new describe block that's a child of this one.
- *
- * @param {string} name Name of the block. Appended to the parent block's name.
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.describe = function(name, body) {
-  var child = new angular.scenario.Describe(name, this);
-  this.children.push(child);
-  body.call(child);
-};
-
-/**
- * Same as describe() but makes ddescribe blocks the only to run.
- *
- * @param {string} name Name of the test.
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.ddescribe = function(name, body) {
-  var child = new angular.scenario.Describe(name, this);
-  child.only = true;
-  this.children.push(child);
-  body.call(child);
-};
-
-/**
- * Use to disable a describe block.
- */
-angular.scenario.Describe.prototype.xdescribe = angular.noop;
-
-/**
- * Defines a test.
- *
- * @param {string} name Name of the test.
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.it = function(name, body) {
-  this.its.push({
-    id: angular.scenario.Describe.specId++,
-    definition: this,
-    only: this.only,
-    name: name,
-    before: this.setupBefore,
-    body: body,
-    after: this.setupAfter
-  });
-};
-
-/**
- * Same as it() but makes iit tests the only test to run.
- *
- * @param {string} name Name of the test.
- * @param {function()} body Body of the block.
- */
-angular.scenario.Describe.prototype.iit = function(name, body) {
-  this.it.apply(this, arguments);
-  this.its[this.its.length - 1].only = true;
-};
-
-/**
- * Use to disable a test block.
- */
-angular.scenario.Describe.prototype.xit = angular.noop;
-
-/**
- * Gets an array of functions representing all the tests (recursively).
- * that can be executed with SpecRunner's.
- *
- * @return {Array<Object>} Array of it blocks {
- *   definition : Object // parent Describe
- *   only: boolean
- *   name: string
- *   before: Function
- *   body: Function
- *   after: Function
- *  }
- */
-angular.scenario.Describe.prototype.getSpecs = function() {
-  var specs = arguments[0] || [];
-  angular.forEach(this.children, function(child) {
-    child.getSpecs(specs);
-  });
-  angular.forEach(this.its, function(it) {
-    specs.push(it);
-  });
-  var only = [];
-  angular.forEach(specs, function(it) {
-    if (it.only) {
-      only.push(it);
-    }
-  });
-  return (only.length && only) || specs;
-};
diff --git a/src/ngScenario/Future.js b/src/ngScenario/Future.js
deleted file mode 100644
index 31597fadc607..000000000000
--- a/src/ngScenario/Future.js
+++ /dev/null
@@ -1,64 +0,0 @@
-'use strict';
-
-/**
- * A future action in a spec.
- *
- * @param {string} name name of the future action
- * @param {function()} behavior future callback(error, result)
- * @param {function()} line Optional. function that returns the file/line number.
- */
-angular.scenario.Future = function(name, behavior, line) {
-  this.name = name;
-  this.behavior = behavior;
-  this.fulfilled = false;
-  this.value = undefined;
-  this.parser = angular.identity;
-  this.line = line || function() { return ''; };
-};
-
-/**
- * Executes the behavior of the closure.
- *
- * @param {function()} doneFn Callback function(error, result)
- */
-angular.scenario.Future.prototype.execute = function(doneFn) {
-  var self = this;
-  this.behavior(function(error, result) {
-    self.fulfilled = true;
-    if (result) {
-      try {
-        result = self.parser(result);
-      } catch (e) {
-        error = e;
-      }
-    }
-    self.value = error || result;
-    doneFn(error, result);
-  });
-};
-
-/**
- * Configures the future to convert its final with a function fn(value)
- *
- * @param {function()} fn function(value) that returns the parsed value
- */
-angular.scenario.Future.prototype.parsedWith = function(fn) {
-  this.parser = fn;
-  return this;
-};
-
-/**
- * Configures the future to parse its final value from JSON
- * into objects.
- */
-angular.scenario.Future.prototype.fromJson = function() {
-  return this.parsedWith(angular.fromJson);
-};
-
-/**
- * Configures the future to convert its final value from objects
- * into JSON.
- */
-angular.scenario.Future.prototype.toJson = function() {
-  return this.parsedWith(angular.toJson);
-};
diff --git a/src/ngScenario/ObjectModel.js b/src/ngScenario/ObjectModel.js
deleted file mode 100644
index b6a43917183c..000000000000
--- a/src/ngScenario/ObjectModel.js
+++ /dev/null
@@ -1,252 +0,0 @@
-'use strict';
-
-/**
- * Maintains an object tree from the runner events.
- *
- * @param {Object} runner The scenario Runner instance to connect to.
- *
- * TODO(esprehn): Every output type creates one of these, but we probably
- *  want one global shared instance. Need to handle events better too
- *  so the HTML output doesn't need to do spec model.getSpec(spec.id)
- *  silliness.
- *
- * TODO(vojta) refactor on, emit methods (from all objects) - use inheritance
- */
-angular.scenario.ObjectModel = function(runner) {
-  var self = this;
-
-  this.specMap = {};
-  this.listeners = [];
-  this.value = {
-    name: '',
-    children: {}
-  };
-
-  runner.on('SpecBegin', function(spec) {
-    var block = self.value,
-        definitions = [];
-
-    angular.forEach(self.getDefinitionPath(spec), function(def) {
-      if (!block.children[def.name]) {
-        block.children[def.name] = {
-          id: def.id,
-          name: def.name,
-          children: {},
-          specs: {}
-        };
-      }
-      block = block.children[def.name];
-      definitions.push(def.name);
-    });
-
-    var it = self.specMap[spec.id] =
-             block.specs[spec.name] =
-             new angular.scenario.ObjectModel.Spec(spec.id, spec.name, definitions);
-
-    // forward the event
-    self.emit('SpecBegin', it);
-  });
-
-  runner.on('SpecError', function(spec, error) {
-    var it = self.getSpec(spec.id);
-    it.status = 'error';
-    it.error = error;
-
-    // forward the event
-    self.emit('SpecError', it, error);
-  });
-
-  runner.on('SpecEnd', function(spec) {
-    var it = self.getSpec(spec.id);
-    complete(it);
-
-    // forward the event
-    self.emit('SpecEnd', it);
-  });
-
-  runner.on('StepBegin', function(spec, step) {
-    var it = self.getSpec(spec.id);
-    step = new angular.scenario.ObjectModel.Step(step.name);
-    it.steps.push(step);
-
-    // forward the event
-    self.emit('StepBegin', it, step);
-  });
-
-  runner.on('StepEnd', function(spec) {
-    var it = self.getSpec(spec.id);
-    var step = it.getLastStep();
-    if (step.name !== step.name) {
-      throw new Error('Events fired in the wrong order. Step names don\'t match.');
-    }
-    complete(step);
-
-    // forward the event
-    self.emit('StepEnd', it, step);
-  });
-
-  runner.on('StepFailure', function(spec, step, error) {
-    var it = self.getSpec(spec.id),
-        modelStep = it.getLastStep();
-
-    modelStep.setErrorStatus('failure', error, step.line());
-    it.setStatusFromStep(modelStep);
-
-    // forward the event
-    self.emit('StepFailure', it, modelStep, error);
-  });
-
-  runner.on('StepError', function(spec, step, error) {
-    var it = self.getSpec(spec.id),
-        modelStep = it.getLastStep();
-
-    modelStep.setErrorStatus('error', error, step.line());
-    it.setStatusFromStep(modelStep);
-
-    // forward the event
-    self.emit('StepError', it, modelStep, error);
-  });
-
-  runner.on('RunnerBegin', function() {
-    self.emit('RunnerBegin');
-  });
-  runner.on('RunnerEnd', function() {
-    self.emit('RunnerEnd');
-  });
-
-  function complete(item) {
-    item.endTime = Date.now();
-    item.duration = item.endTime - item.startTime;
-    item.status = item.status || 'success';
-  }
-};
-
-/**
- * Adds a listener for an event.
- *
- * @param {string} eventName Name of the event to add a handler for
- * @param {function()} listener Function that will be called when event is fired
- */
-angular.scenario.ObjectModel.prototype.on = function(eventName, listener) {
-  eventName = eventName.toLowerCase();
-  this.listeners[eventName] = this.listeners[eventName] || [];
-  this.listeners[eventName].push(listener);
-};
-
-/**
- * Emits an event which notifies listeners and passes extra
- * arguments.
- *
- * @param {string} eventName Name of the event to fire.
- */
-angular.scenario.ObjectModel.prototype.emit = function(eventName) {
-  var self = this,
-      args = Array.prototype.slice.call(arguments, 1);
-
-  eventName = eventName.toLowerCase();
-
-  if (this.listeners[eventName]) {
-    angular.forEach(this.listeners[eventName], function(listener) {
-      listener.apply(self, args);
-    });
-  }
-};
-
-/**
- * Computes the path of definition describe blocks that wrap around
- * this spec.
- *
- * @param spec Spec to compute the path for.
- * @return {Array<Describe>} The describe block path
- */
-angular.scenario.ObjectModel.prototype.getDefinitionPath = function(spec) {
-  var path = [];
-  var currentDefinition = spec.definition;
-  while (currentDefinition && currentDefinition.name) {
-    path.unshift(currentDefinition);
-    currentDefinition = currentDefinition.parent;
-  }
-  return path;
-};
-
-/**
- * Gets a spec by id.
- *
- * @param {string} id The id of the spec to get the object for.
- * @return {Object} the Spec instance
- */
-angular.scenario.ObjectModel.prototype.getSpec = function(id) {
-  return this.specMap[id];
-};
-
-/**
- * A single it block.
- *
- * @param {string} id Id of the spec
- * @param {string} name Name of the spec
- * @param {Array<string>=} definitionNames List of all describe block names that wrap this spec
- */
-angular.scenario.ObjectModel.Spec = function(id, name, definitionNames) {
-  this.id = id;
-  this.name = name;
-  this.startTime = Date.now();
-  this.steps = [];
-  this.fullDefinitionName = (definitionNames || []).join(' ');
-};
-
-/**
- * Adds a new step to the Spec.
- *
- * @param {string} name Name of the step (really name of the future)
- * @return {Object} the added step
- */
-angular.scenario.ObjectModel.Spec.prototype.addStep = function(name) {
-  var step = new angular.scenario.ObjectModel.Step(name);
-  this.steps.push(step);
-  return step;
-};
-
-/**
- * Gets the most recent step.
- *
- * @return {Object} the step
- */
-angular.scenario.ObjectModel.Spec.prototype.getLastStep = function() {
-  return this.steps[this.steps.length - 1];
-};
-
-/**
- * Set status of the Spec from given Step
- *
- * @param {angular.scenario.ObjectModel.Step} step
- */
-angular.scenario.ObjectModel.Spec.prototype.setStatusFromStep = function(step) {
-  if (!this.status || step.status === 'error') {
-    this.status = step.status;
-    this.error = step.error;
-    this.line = step.line;
-  }
-};
-
-/**
- * A single step inside a Spec.
- *
- * @param {string} name Name of the step
- */
-angular.scenario.ObjectModel.Step = function(name) {
-  this.name = name;
-  this.startTime = Date.now();
-};
-
-/**
- * Helper method for setting all error status related properties
- *
- * @param {string} status
- * @param {string} error
- * @param {string} line
- */
-angular.scenario.ObjectModel.Step.prototype.setErrorStatus = function(status, error, line) {
-  this.status = status;
-  this.error = error;
-  this.line = line;
-};
diff --git a/src/ngScenario/Runner.js b/src/ngScenario/Runner.js
deleted file mode 100644
index d2f4864ff837..000000000000
--- a/src/ngScenario/Runner.js
+++ /dev/null
@@ -1,229 +0,0 @@
-'use strict';
-
-/**
- * Runner for scenarios
- *
- * Has to be initialized before any test is loaded,
- * because it publishes the API into window (global space).
- */
-angular.scenario.Runner = function($window) {
-  this.listeners = [];
-  this.$window = $window;
-  this.rootDescribe = new angular.scenario.Describe();
-  this.currentDescribe = this.rootDescribe;
-  this.api = {
-    it: this.it,
-    iit: this.iit,
-    xit: angular.noop,
-    describe: this.describe,
-    ddescribe: this.ddescribe,
-    xdescribe: angular.noop,
-    beforeEach: this.beforeEach,
-    afterEach: this.afterEach
-  };
-  angular.forEach(this.api, angular.bind(this, /** @this */ function(fn, key) {
-    this.$window[key] = angular.bind(this, fn);
-  }));
-};
-
-/**
- * Emits an event which notifies listeners and passes extra
- * arguments.
- *
- * @param {string} eventName Name of the event to fire.
- */
-angular.scenario.Runner.prototype.emit = function(eventName) {
-  var self = this;
-  var args = Array.prototype.slice.call(arguments, 1);
-  eventName = eventName.toLowerCase();
-  if (!this.listeners[eventName]) {
-    return;
-  }
-  angular.forEach(this.listeners[eventName], function(listener) {
-    listener.apply(self, args);
-  });
-};
-
-/**
- * Adds a listener for an event.
- *
- * @param {string} eventName The name of the event to add a handler for
- * @param {string} listener The fn(...) that takes the extra arguments from emit()
- */
-angular.scenario.Runner.prototype.on = function(eventName, listener) {
-  eventName = eventName.toLowerCase();
-  this.listeners[eventName] = this.listeners[eventName] || [];
-  this.listeners[eventName].push(listener);
-};
-
-/**
- * Defines a describe block of a spec.
- *
- * @see Describe.js
- *
- * @param {string} name Name of the block
- * @param {function()} body Body of the block
- */
-angular.scenario.Runner.prototype.describe = function(name, body) {
-  var self = this;
-  this.currentDescribe.describe(name, /** @this */ function() {
-    var parentDescribe = self.currentDescribe;
-    self.currentDescribe = this;
-    try {
-      body.call(this);
-    } finally {
-      self.currentDescribe = parentDescribe;
-    }
-  });
-};
-
-/**
- * Same as describe, but makes ddescribe the only blocks to run.
- *
- * @see Describe.js
- *
- * @param {string} name Name of the block
- * @param {function()} body Body of the block
- */
-angular.scenario.Runner.prototype.ddescribe = function(name, body) {
-  var self = this;
-  this.currentDescribe.ddescribe(name, /** @this */ function() {
-    var parentDescribe = self.currentDescribe;
-    self.currentDescribe = this;
-    try {
-      body.call(this);
-    } finally {
-      self.currentDescribe = parentDescribe;
-    }
-  });
-};
-
-/**
- * Defines a test in a describe block of a spec.
- *
- * @see Describe.js
- *
- * @param {string} name Name of the block
- * @param {function()} body Body of the block
- */
-angular.scenario.Runner.prototype.it = function(name, body) {
-  this.currentDescribe.it(name, body);
-};
-
-/**
- * Same as it, but makes iit tests the only tests to run.
- *
- * @see Describe.js
- *
- * @param {string} name Name of the block
- * @param {function()} body Body of the block
- */
-angular.scenario.Runner.prototype.iit = function(name, body) {
-  this.currentDescribe.iit(name, body);
-};
-
-/**
- * Defines a function to be called before each it block in the describe
- * (and before all nested describes).
- *
- * @see Describe.js
- *
- * @param {function()} Callback to execute
- */
-angular.scenario.Runner.prototype.beforeEach = function(body) {
-  this.currentDescribe.beforeEach(body);
-};
-
-/**
- * Defines a function to be called after each it block in the describe
- * (and before all nested describes).
- *
- * @see Describe.js
- *
- * @param {function()} Callback to execute
- */
-angular.scenario.Runner.prototype.afterEach = function(body) {
-  this.currentDescribe.afterEach(body);
-};
-
-/**
- * Creates a new spec runner.
- *
- * @private
- * @param {Object} scope parent scope
- */
-angular.scenario.Runner.prototype.createSpecRunner_ = function(scope) {
-  var child = scope.$new();
-  var Cls = angular.scenario.SpecRunner;
-
-  // Export all the methods to child scope manually as now we don't mess controllers with scopes
-  // TODO(vojta): refactor scenario runner so that these objects are not tightly coupled as current
-  for (var name in Cls.prototype) {
-    child[name] = angular.bind(child, Cls.prototype[name]);
-  }
-
-  Cls.call(child);
-  return child;
-};
-
-/**
- * Runs all the loaded tests with the specified runner class on the
- * provided application.
- *
- * @param {angular.scenario.Application} application App to remote control.
- */
-angular.scenario.Runner.prototype.run = function(application) {
-  var self = this;
-  var $root = angular.injector(['ng']).get('$rootScope');
-  angular.extend($root, this);
-  angular.forEach(angular.scenario.Runner.prototype, function(fn, name) {
-    $root[name] = angular.bind(self, fn);
-  });
-  $root.application = application;
-  $root.emit('RunnerBegin');
-  asyncForEach(this.rootDescribe.getSpecs(), function(spec, specDone) {
-    var dslCache = {};
-    var runner = self.createSpecRunner_($root);
-    angular.forEach(angular.scenario.dsl, function(fn, key) {
-      dslCache[key] = fn.call($root);
-    });
-    angular.forEach(angular.scenario.dsl, function(fn, key) {
-      self.$window[key] = function() {
-        var line = callerFile(3);
-        var scope = runner.$new();
-
-        // Make the dsl accessible on the current chain
-        scope.dsl = {};
-        angular.forEach(dslCache, function(fn, key) {
-          scope.dsl[key] = function() {
-            return dslCache[key].apply(scope, arguments);
-          };
-        });
-
-        // Make these methods work on the current chain
-        scope.addFuture = function() {
-          Array.prototype.push.call(arguments, line);
-          return angular.scenario.SpecRunner.
-            prototype.addFuture.apply(scope, arguments);
-        };
-        scope.addFutureAction = function() {
-          Array.prototype.push.call(arguments, line);
-          return angular.scenario.SpecRunner.
-            prototype.addFutureAction.apply(scope, arguments);
-        };
-
-        return scope.dsl[key].apply(scope, arguments);
-      };
-    });
-    runner.run(spec, /** @this */ function() {
-      runner.$destroy();
-      specDone.apply(this, arguments);
-    });
-  },
-  function(error) {
-    if (error) {
-      self.emit('RunnerError', error);
-    }
-    self.emit('RunnerEnd');
-  });
-};
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js
deleted file mode 100644
index 85b53eb68cec..000000000000
--- a/src/ngScenario/Scenario.js
+++ /dev/null
@@ -1,329 +0,0 @@
-'use strict';
-
-
-/**
- * Setup file for the Scenario.
- * Must be first in the compilation/bootstrap list.
- */
-
-// Public namespace
-angular.scenario = angular.scenario || {};
-
-/**
- * Expose jQuery (e.g. for custom dsl extensions).
- */
-angular.scenario.jQuery = _jQuery;
-
-/**
- * Defines a new output format.
- *
- * @param {string} name the name of the new output format
- * @param {function()} fn function(context, runner) that generates the output
- */
-angular.scenario.output = angular.scenario.output || function(name, fn) {
-  angular.scenario.output[name] = fn;
-};
-
-/**
- * Defines a new DSL statement. If your factory function returns a Future
- * it's returned, otherwise the result is assumed to be a map of functions
- * for chaining. Chained functions are subject to the same rules.
- *
- * Note: All functions on the chain are bound to the chain scope so values
- *   set on "this" in your statement function are available in the chained
- *   functions.
- *
- * @param {string} name The name of the statement
- * @param {function()} fn Factory function(), return a function for
- *  the statement.
- */
-angular.scenario.dsl = angular.scenario.dsl || function(name, fn) {
-  angular.scenario.dsl[name] = function() {
-    // The dsl binds `this` for us when calling chained functions
-    /** @this */
-    function executeStatement(statement, args) {
-      var result = statement.apply(this, args);
-      if (angular.isFunction(result) || result instanceof angular.scenario.Future) {
-        return result;
-      }
-      var self = this;
-      var chain = angular.extend({}, result);
-      angular.forEach(chain, function(value, name) {
-        if (angular.isFunction(value)) {
-          chain[name] = function() {
-            return executeStatement.call(self, value, arguments);
-          };
-        } else {
-          chain[name] = value;
-        }
-      });
-      return chain;
-    }
-    var statement = fn.apply(this, arguments);
-    return /** @this */ function() {
-      return executeStatement.call(this, statement, arguments);
-    };
-  };
-};
-
-/**
- * Defines a new matcher for use with the expects() statement. The value
- * this.actual (like in Jasmine) is available in your matcher to compare
- * against. Your function should return a boolean. The future is automatically
- * created for you.
- *
- * @param {string} name The name of the matcher
- * @param {function()} fn The matching function(expected).
- */
-angular.scenario.matcher = angular.scenario.matcher || function(name, fn) {
-  angular.scenario.matcher[name] = function(expected) {
-    var description = this.future.name +
-                      (this.inverse ? ' not ' : ' ') + name +
-                      ' ' + angular.toJson(expected);
-    var self = this;
-    this.addFuture('expect ' + description,
-      function(done) {
-        var error;
-        self.actual = self.future.value;
-        if ((self.inverse && fn.call(self, expected)) ||
-            (!self.inverse && !fn.call(self, expected))) {
-          error = 'expected ' + description +
-            ' but was ' + angular.toJson(self.actual);
-        }
-        done(error);
-    });
-  };
-};
-
-/**
- * Initialize the scenario runner and run !
- *
- * Access global window and document object
- * Access $runner through closure
- *
- * @param {Object=} config Config options
- */
-angular.scenario.setUpAndRun = function(config) {
-  var href = window.location.href;
-  var body = _jQuery(window.document.body);
-  var output = [];
-  var objModel = new angular.scenario.ObjectModel($runner);
-
-  if (config && config.scenario_output) {
-    output = config.scenario_output.split(',');
-  }
-
-  angular.forEach(angular.scenario.output, function(fn, name) {
-    if (!output.length || output.indexOf(name) !== -1) {
-      var context = body.append('<div></div>').find('div:last');
-      context.attr('id', name);
-      fn.call({}, context, $runner, objModel);
-    }
-  });
-
-  if (!/^http/.test(href) && !/^https/.test(href)) {
-    body.append('<p id="system-error"></p>');
-    body.find('#system-error').text(
-      'Scenario runner must be run using http or https. The protocol ' +
-      href.split(':')[0] + ':// is not supported.'
-    );
-    return;
-  }
-
-  var appFrame = body.append('<div id="application"></div>').find('#application');
-  var application = new angular.scenario.Application(appFrame);
-
-  $runner.on('RunnerEnd', function() {
-    appFrame.css('display', 'none');
-    appFrame.find('iframe').attr('src', 'about:blank');
-  });
-
-  $runner.on('RunnerError', function(error) {
-    if (window.console) {
-      console.log(formatException(error));
-    } else {
-      // Do something for IE
-      // eslint-disable-next-line no-alert
-      alert(error);
-    }
-  });
-
-  $runner.run(application);
-};
-
-/**
- * Iterates through list with iterator function that must call the
- * continueFunction to continue iterating.
- *
- * @param {Array} list list to iterate over
- * @param {function()} iterator Callback function(value, continueFunction)
- * @param {function()} done Callback function(error, result) called when
- *   iteration finishes or an error occurs.
- */
-function asyncForEach(list, iterator, done) {
-  var i = 0;
-  function loop(error, index) {
-    if (index && index > i) {
-      i = index;
-    }
-    if (error || i >= list.length) {
-      done(error);
-    } else {
-      try {
-        iterator(list[i++], loop);
-      } catch (e) {
-        done(e);
-      }
-    }
-  }
-  loop();
-}
-
-/**
- * Formats an exception into a string with the stack trace, but limits
- * to a specific line length.
- *
- * @param {Object} error The exception to format, can be anything throwable
- * @param {Number=} [maxStackLines=5] max lines of the stack trace to include
- *  default is 5.
- */
-function formatException(error, maxStackLines) {
-  maxStackLines = maxStackLines || 5;
-  var message = error.toString();
-  if (error.stack) {
-    var stack = error.stack.split('\n');
-    if (stack[0].indexOf(message) === -1) {
-      maxStackLines++;
-      stack.unshift(error.message);
-    }
-    message = stack.slice(0, maxStackLines).join('\n');
-  }
-  return message;
-}
-
-/**
- * Returns a function that gets the file name and line number from a
- * location in the stack if available based on the call site.
- *
- * Note: this returns another function because accessing .stack is very
- * expensive in Chrome.
- *
- * @param {Number} offset Number of stack lines to skip
- */
-function callerFile(offset) {
-  var error = new Error();
-
-  return function() {
-    var line = (error.stack || '').split('\n')[offset];
-
-    // Clean up the stack trace line
-    if (line) {
-      if (line.indexOf('@') !== -1) {
-        // Firefox
-        line = line.substring(line.indexOf('@') + 1);
-      } else {
-        // Chrome
-        line = line.substring(line.indexOf('(') + 1).replace(')', '');
-      }
-    }
-
-    return line || '';
-  };
-}
-
-
-/**
- * Don't use the jQuery trigger method since it works incorrectly.
- *
- * jQuery notifies listeners and then changes the state of a checkbox and
- * does not create a real browser event. A real click changes the state of
- * the checkbox and then notifies listeners.
- *
- * To work around this we instead use our own handler that fires a real event.
- */
-(function(fn) {
-  // We need a handle to the original trigger function for input tests.
-  var parentTrigger = fn._originalTrigger = fn.trigger;
-  fn.trigger = function(type) {
-    if (/(click|change|keydown|blur|input|mousedown|mouseup)/.test(type)) {
-      var processDefaults = [];
-      this.each(function(index, node) {
-        processDefaults.push(browserTrigger(node, type));
-      });
-
-      // this is not compatible with jQuery - we return an array of returned values,
-      // so that scenario runner know whether JS code has preventDefault() of the event or not...
-      return processDefaults;
-    }
-    return parentTrigger.apply(this, arguments);
-  };
-})(_jQuery.fn);
-
-/**
- * Finds all bindings with the substring match of name and returns an
- * array of their values.
- *
- * @param {string} bindExp The name to match
- * @return {Array.<string>} String of binding values
- */
-_jQuery.fn.bindings = function(windowJquery, bindExp) {
-  var result = [], match,
-      bindSelector = '.ng-binding:visible';
-  if (angular.isString(bindExp)) {
-    bindExp = bindExp.replace(/\s/g, '');
-    match = function(actualExp) {
-      if (actualExp) {
-        actualExp = actualExp.replace(/\s/g, '');
-        if (actualExp === bindExp) return true;
-        if (actualExp.indexOf(bindExp) === 0) {
-          return actualExp.charAt(bindExp.length) === '|';
-        }
-      }
-    };
-  } else if (bindExp) {
-    match = function(actualExp) {
-      return actualExp && bindExp.exec(actualExp);
-    };
-  } else {
-    match = function(actualExp) {
-      return !!actualExp;
-    };
-  }
-  var selection = this.find(bindSelector);
-  if (this.is(bindSelector)) {
-    selection = selection.add(this);
-  }
-
-  function push(value) {
-    if (angular.isUndefined(value)) {
-      value = '';
-    } else if (typeof value !== 'string') {
-      value = angular.toJson(value);
-    }
-    result.push('' + value);
-  }
-
-  selection.each(/* @this Node */ function() {
-    var element = windowJquery(this),
-        bindings;
-    if ((bindings = element.data('$binding'))) {
-      for (var expressions = [], binding, j = 0, jj = bindings.length; j < jj; j++) {
-        binding = bindings[j];
-
-        if (binding.expressions) {
-          expressions = binding.expressions;
-        } else {
-          expressions = [binding];
-        }
-        for (var scope, expression, i = 0, ii = expressions.length; i < ii; i++) {
-          expression = expressions[i];
-          if (match(expression)) {
-            scope = scope || element.scope();
-            push(scope.$eval(expression));
-          }
-        }
-      }
-    }
-  });
-  return result;
-};
diff --git a/src/ngScenario/SpecRunner.js b/src/ngScenario/SpecRunner.js
deleted file mode 100644
index 142c2f363453..000000000000
--- a/src/ngScenario/SpecRunner.js
+++ /dev/null
@@ -1,149 +0,0 @@
-'use strict';
-
-/**
- * This class is the "this" of the it/beforeEach/afterEach method.
- * Responsibilities:
- *   - "this" for it/beforeEach/afterEach
- *   - keep state for single it/beforeEach/afterEach execution
- *   - keep track of all of the futures to execute
- *   - run single spec (execute each future)
- */
-angular.scenario.SpecRunner = function() {
-  this.futures = [];
-  this.afterIndex = 0;
-};
-
-/**
- * Executes a spec which is an it block with associated before/after functions
- * based on the describe nesting.
- *
- * @param {Object} spec A spec object
- * @param {function()} specDone function that is called when the spec finishes,
- *                              of the form `Function(error, index)`
- */
-angular.scenario.SpecRunner.prototype.run = function(spec, specDone) {
-  var self = this;
-  this.spec = spec;
-
-  this.emit('SpecBegin', spec);
-
-  try {
-    spec.before.call(this);
-    spec.body.call(this);
-    this.afterIndex = this.futures.length;
-    spec.after.call(this);
-  } catch (e) {
-    this.emit('SpecError', spec, e);
-    this.emit('SpecEnd', spec);
-    specDone();
-    return;
-  }
-
-  var handleError = function(error, done) {
-    if (self.error) {
-      return done();
-    }
-    self.error = true;
-    done(null, self.afterIndex);
-  };
-
-  asyncForEach(
-    this.futures,
-    function(future, futureDone) {
-      self.step = future;
-      self.emit('StepBegin', spec, future);
-      try {
-        future.execute(function(error) {
-          if (error) {
-            self.emit('StepFailure', spec, future, error);
-            self.emit('StepEnd', spec, future);
-            return handleError(error, futureDone);
-          }
-          self.emit('StepEnd', spec, future);
-          self.$window.setTimeout(function() { futureDone(); }, 0);
-        });
-      } catch (e) {
-        self.emit('StepError', spec, future, e);
-        self.emit('StepEnd', spec, future);
-        handleError(e, futureDone);
-      }
-    },
-    function(e) {
-      if (e) {
-        self.emit('SpecError', spec, e);
-      }
-      self.emit('SpecEnd', spec);
-      // Call done in a timeout so exceptions don't recursively
-      // call this function
-      self.$window.setTimeout(function() { specDone(); }, 0);
-    }
-  );
-};
-
-/**
- * Adds a new future action.
- *
- * Note: Do not pass line manually. It happens automatically.
- *
- * @param {string} name Name of the future
- * @param {function()} behavior Behavior of the future
- * @param {function()} line fn() that returns file/line number
- */
-angular.scenario.SpecRunner.prototype.addFuture = function(name, behavior, line) {
-  var future = new angular.scenario.Future(name, angular.bind(this, behavior), line);
-  this.futures.push(future);
-  return future;
-};
-
-/**
- * Adds a new future action to be executed on the application window.
- *
- * Note: Do not pass line manually. It happens automatically.
- *
- * @param {string} name Name of the future
- * @param {function()} behavior Behavior of the future
- * @param {function()} line fn() that returns file/line number
- */
-angular.scenario.SpecRunner.prototype.addFutureAction = function(name, behavior, line) {
-  var self = this;
-  var NG = /\[ng\\:/;
-  return this.addFuture(name, /** @this */ function(done) {
-    this.application.executeAction(function($window, $document) {
-
-      //TODO(esprehn): Refactor this so it doesn't need to be in here.
-      $document.elements = function(selector) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        selector = (self.selector || '') + ' ' + (selector || '');
-        selector = _jQuery.trim(selector) || '*';
-        angular.forEach(args, function(value, index) {
-          selector = selector.replace('$' + (index + 1), value);
-        });
-        var result = $document.find(selector);
-        if (selector.match(NG)) {
-          angular.forEach(['[ng-','[data-ng-','[x-ng-'], function(value, index) {
-            result = result.add(selector.replace(NG, value), $document);
-          });
-        }
-        if (!result.length) {
-          // eslint-disable-next-line no-throw-literal
-          throw {
-            type: 'selector',
-            message: 'Selector ' + selector + ' did not match any elements.'
-          };
-        }
-
-        return result;
-      };
-
-      try {
-        behavior.call(self, $window, $document, done);
-      } catch (e) {
-        if (e.type && e.type === 'selector') {
-          done(e.message);
-        } else {
-          throw e;
-        }
-      }
-    });
-  }, line);
-};
diff --git a/src/ngScenario/angular-bootstrap.js b/src/ngScenario/angular-bootstrap.js
deleted file mode 100644
index fae98227f1a5..000000000000
--- a/src/ngScenario/angular-bootstrap.js
+++ /dev/null
@@ -1,60 +0,0 @@
-'use strict';
-
-(function(previousOnLoad) {
-  var prefix = (function() {
-    var filename = /(.*\/)angular-bootstrap.js(#(.*))?/;
-    var scripts = window.document.getElementsByTagName('script');
-    for (var j = 0; j < scripts.length; j++) {
-      var src = scripts[j].src;
-      if (src && src.match(filename)) {
-        var parts = src.match(filename);
-        return parts[1];
-      }
-    }
-  })();
-
-  function addScript(path) {
-    window.document.write('<script type="text/javascript" src="' + prefix + path + '"></script>');
-  }
-
-  function addCSS(path) {
-    window.document.write('<link rel="stylesheet" type="text/css" href="' + prefix + path + '"/>');
-  }
-
-  window.onload = function() {
-    try {
-      if (previousOnLoad) previousOnLoad();
-    } catch (e) { /* empty */ }
-    angular.scenario.setUpAndRun({});
-  };
-
-  addCSS('../../css/angular-scenario.css');
-  addScript('../../lib/jquery/jquery.js');
-  window.document.write(
-    '<script type="text/javascript">' +
-    'var _jQuery = jQuery.noConflict(true);' +
-    '</script>'
-  );
-  addScript('../angular-bootstrap.js');
-
-  addScript('Scenario.js');
-  addScript('Application.js');
-  addScript('Describe.js');
-  addScript('Future.js');
-  addScript('Runner.js');
-  addScript('SpecRunner.js');
-  addScript('dsl.js');
-  addScript('matchers.js');
-  addScript('ObjectModel.js');
-  addScript('output/Html.js');
-  addScript('output/Json.js');
-  addScript('output/Object.js');
-  addScript('output/Xml.js');
-
-  // Create the runner (which also sets up the global API)
-  window.document.write(
-    '<script type="text/javascript">' +
-    '  var $runner = new angular.scenario.Runner(window);' +
-    '</script>');
-
-})(window.onload);
diff --git a/src/ngScenario/angular.prefix b/src/ngScenario/angular.prefix
deleted file mode 100644
index 3ccd4537f775..000000000000
--- a/src/ngScenario/angular.prefix
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2017 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window){
-  var _jQuery = window.jQuery.noConflict(true);
diff --git a/src/ngScenario/angular.suffix b/src/ngScenario/angular.suffix
deleted file mode 100644
index 5c89e61036f3..000000000000
--- a/src/ngScenario/angular.suffix
+++ /dev/null
@@ -1,22 +0,0 @@
-bindJQuery();
-publishExternalAPI(angular);
-
-var $runner = new angular.scenario.Runner(window),
-    scripts = window.document.getElementsByTagName('script'),
-    script = scripts[scripts.length - 1],
-    config = {};
-
-angular.forEach(script.attributes, function(attr) {
-  var match = attr.name.match(/ng[:\-](.*)/);
-  if (match) {
-    config[match[1]] = attr.value || true;
-  }
-});
-
-if (config.autotest) {
-  JQLite(function() {
-    angular.scenario.setUpAndRun(config);
-  });
-}
-})(window);
-
diff --git a/src/ngScenario/dsl.js b/src/ngScenario/dsl.js
deleted file mode 100644
index 3849c4515aff..000000000000
--- a/src/ngScenario/dsl.js
+++ /dev/null
@@ -1,484 +0,0 @@
-'use strict';
-
-/* eslint-disable no-invalid-this */
-
-/**
- * Shared DSL statements that are useful to all scenarios.
- */
-
- /**
- * Usage:
- *    pause() pauses until you call resume() in the console
- */
-angular.scenario.dsl('pause', function() {
-  return function() {
-    return this.addFuture('pausing for you to resume', function(done) {
-      this.emit('InteractivePause', this.spec, this.step);
-      this.$window.resume = function() { done(); };
-    });
-  };
-});
-
-/**
- * Usage:
- *    sleep(seconds) pauses the test for specified number of seconds
- */
-angular.scenario.dsl('sleep', function() {
-  return function(time) {
-    return this.addFuture('sleep for ' + time + ' seconds', function(done) {
-      this.$window.setTimeout(function() { done(null, time * 1000); }, time * 1000);
-    });
-  };
-});
-
-/**
- * Usage:
- *    browser().navigateTo(url) Loads the url into the frame
- *    browser().navigateTo(url, fn) where fn(url) is called and returns the URL to navigate to
- *    browser().reload() refresh the page (reload the same URL)
- *    browser().window.href() window.location.href
- *    browser().window.path() window.location.pathname
- *    browser().window.search() window.location.search
- *    browser().window.hash() window.location.hash without # prefix
- *    browser().location().url() see ng.$location#url
- *    browser().location().path() see ng.$location#path
- *    browser().location().search() see ng.$location#search
- *    browser().location().hash() see ng.$location#hash
- */
-angular.scenario.dsl('browser', function() {
-  var chain = {};
-
-  chain.navigateTo = function(url, delegate) {
-    var application = this.application;
-    return this.addFuture('browser navigate to \'' + url + '\'', function(done) {
-      if (delegate) {
-        url = delegate.call(this, url);
-      }
-      application.navigateTo(url, function() {
-        done(null, url);
-      }, done);
-    });
-  };
-
-  chain.reload = function() {
-    var application = this.application;
-    return this.addFutureAction('browser reload', function($window, $document, done) {
-      var href = $window.location.href;
-      application.navigateTo(href, function() {
-        done(null, href);
-      }, done);
-    });
-  };
-
-  chain.window = function() {
-    var api = {};
-
-    api.href = function() {
-      return this.addFutureAction('window.location.href', function($window, $document, done) {
-        done(null, $window.location.href);
-      });
-    };
-
-    api.path = function() {
-      return this.addFutureAction('window.location.path', function($window, $document, done) {
-        done(null, $window.location.pathname);
-      });
-    };
-
-    api.search = function() {
-      return this.addFutureAction('window.location.search', function($window, $document, done) {
-        done(null, $window.location.search);
-      });
-    };
-
-    api.hash = function() {
-      return this.addFutureAction('window.location.hash', function($window, $document, done) {
-        done(null, $window.location.hash.replace('#', ''));
-      });
-    };
-
-    return api;
-  };
-
-  chain.location = function() {
-    var api = {};
-
-    api.url = function() {
-      return this.addFutureAction('$location.url()', function($window, $document, done) {
-        done(null, $document.injector().get('$location').url());
-      });
-    };
-
-    api.path = function() {
-      return this.addFutureAction('$location.path()', function($window, $document, done) {
-        done(null, $document.injector().get('$location').path());
-      });
-    };
-
-    api.search = function() {
-      return this.addFutureAction('$location.search()', function($window, $document, done) {
-        done(null, $document.injector().get('$location').search());
-      });
-    };
-
-    api.hash = function() {
-      return this.addFutureAction('$location.hash()', function($window, $document, done) {
-        done(null, $document.injector().get('$location').hash());
-      });
-    };
-
-    return api;
-  };
-
-  return function() {
-    return chain;
-  };
-});
-
-/**
- * Usage:
- *    expect(future).{matcher} where matcher is one of the matchers defined
- *    with angular.scenario.matcher
- *
- * ex. expect(binding("name")).toEqual("Elliott")
- */
-angular.scenario.dsl('expect', function() {
-  var chain = angular.extend({}, angular.scenario.matcher);
-
-  chain.not = function() {
-    this.inverse = true;
-    return chain;
-  };
-
-  return function(future) {
-    this.future = future;
-    return chain;
-  };
-});
-
-/**
- * Usage:
- *    using(selector, label) scopes the next DSL element selection
- *
- * ex.
- *   using('#foo', "'Foo' text field").input('bar')
- */
-angular.scenario.dsl('using', function() {
-  return function(selector, label) {
-    this.selector = _jQuery.trim((this.selector || '') + ' ' + selector);
-    if (angular.isString(label) && label.length) {
-      this.label = label + ' ( ' + this.selector + ' )';
-    } else {
-      this.label = this.selector;
-    }
-    return this.dsl;
-  };
-});
-
-/**
- * Usage:
- *    binding(name) returns the value of the first matching binding
- */
-angular.scenario.dsl('binding', function() {
-  return function(name) {
-    return this.addFutureAction('select binding \'' + name + '\'',
-      function($window, $document, done) {
-        var values = $document.elements().bindings($window.angular.element, name);
-        if (!values.length) {
-          return done('Binding selector \'' + name + '\' did not match.');
-        }
-        done(null, values[0]);
-    });
-  };
-});
-
-/**
- * Usage:
- *    input(name).enter(value) enters value in input with specified name
- *    input(name).check() checks checkbox
- *    input(name).select(value) selects the radio button with specified name/value
- *    input(name).val() returns the value of the input.
- */
-angular.scenario.dsl('input', function() {
-  var chain = {};
-
-  // Support: IE 9-11 only
-  // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
-  // it. In particular the event is not fired when backspace or delete key are pressed or
-  // when cut operation is performed.
-  // IE10+ implements 'input' event but it erroneously fires under various situations,
-  // e.g. when placeholder changes, or a form is focused.
-  var supportInputEvent = 'oninput' in window.document.createElement('div') && !msie;
-
-  chain.enter = function(value, event) {
-    return this.addFutureAction('input \'' + this.name + '\' enter \'' + value + '\'',
-      function($window, $document, done) {
-        var input = $document.elements('[ng\\:model="$1"]', this.name).filter(':input');
-        input.val(value);
-        input.trigger(event || (supportInputEvent ? 'input' : 'change'));
-        done();
-    });
-  };
-
-  chain.check = function() {
-    return this.addFutureAction('checkbox \'' + this.name + '\' toggle',
-      function($window, $document, done) {
-        var input = $document.elements('[ng\\:model="$1"]', this.name).filter(':checkbox');
-        input.trigger('click');
-        done();
-    });
-  };
-
-  chain.select = function(value) {
-    return this.addFutureAction('radio button \'' + this.name + '\' toggle \'' + value + '\'',
-      function($window, $document, done) {
-        var input = $document.
-          elements('[ng\\:model="$1"][value="$2"]', this.name, value).filter(':radio');
-        input.trigger('click');
-        done();
-    });
-  };
-
-  chain.val = function() {
-    return this.addFutureAction('return input val', function($window, $document, done) {
-      var input = $document.elements('[ng\\:model="$1"]', this.name).filter(':input');
-      done(null,input.val());
-    });
-  };
-
-  return function(name) {
-    this.name = name;
-    return chain;
-  };
-});
-
-
-/**
- * Usage:
- *    repeater('#products table', 'Product List').count() number of rows
- *    repeater('#products table', 'Product List').row(1) all bindings in row as an array
- *    repeater('#products table', 'Product List').column('product.name') all values across all rows
- *    in an array
- */
-angular.scenario.dsl('repeater', function() {
-  var chain = {};
-
-  chain.count = function() {
-    return this.addFutureAction('repeater \'' + this.label + '\' count',
-      function($window, $document, done) {
-        try {
-          done(null, $document.elements().length);
-        } catch (e) {
-          done(null, 0);
-        }
-    });
-  };
-
-  chain.column = function(binding) {
-    return this.addFutureAction('repeater \'' + this.label + '\' column \'' + binding + '\'',
-      function($window, $document, done) {
-        done(null, $document.elements().bindings($window.angular.element, binding));
-    });
-  };
-
-  chain.row = function(index) {
-    return this.addFutureAction('repeater \'' + this.label + '\' row \'' + index + '\'',
-      function($window, $document, done) {
-        var matches = $document.elements().slice(index, index + 1);
-        if (!matches.length) {
-          return done('row ' + index + ' out of bounds');
-        }
-        done(null, matches.bindings($window.angular.element));
-    });
-  };
-
-  return function(selector, label) {
-    this.dsl.using(selector, label);
-    return chain;
-  };
-});
-
-/**
- * Usage:
- *    select(name).option('value') select one option
- *    select(name).options('value1', 'value2', ...) select options from a multi select
- */
-angular.scenario.dsl('select', function() {
-  var chain = {};
-
-  chain.option = function(value) {
-    return this.addFutureAction('select \'' + this.name + '\' option \'' + value + '\'',
-      function($window, $document, done) {
-        var select = $document.elements('select[ng\\:model="$1"]', this.name);
-        var option = select.find('option[value="' + value + '"]');
-        if (option.length) {
-          select.val(value);
-        } else {
-          option = select.find('option').filter(function() {
-            return _jQuery(this).text() === value;
-          });
-          if (!option.length) {
-            option = select.find('option:contains("' + value + '")');
-          }
-          if (option.length) {
-            select.val(option.val());
-          } else {
-              return done('option \'' + value + '\' not found');
-          }
-        }
-        select.trigger('change');
-        done();
-    });
-  };
-
-  chain.options = function() {
-    var values = arguments;
-    return this.addFutureAction('select \'' + this.name + '\' options \'' + values + '\'',
-      function($window, $document, done) {
-        var select = $document.elements('select[multiple][ng\\:model="$1"]', this.name);
-        select.val(values);
-        select.trigger('change');
-        done();
-    });
-  };
-
-  return function(name) {
-    this.name = name;
-    return chain;
-  };
-});
-
-/**
- * Usage:
- *    element(selector, label).count() get the number of elements that match selector
- *    element(selector, label).click() clicks an element
- *    element(selector, label).mouseover() mouseover an element
- *    element(selector, label).mousedown() mousedown an element
- *    element(selector, label).mouseup() mouseup an element
- *    element(selector, label).query(fn) executes fn(selectedElements, done)
- *    element(selector, label).{method}() gets the value (as defined by jQuery, ex. val)
- *    element(selector, label).{method}(value) sets the value (as defined by jQuery, ex. val)
- *    element(selector, label).{method}(key) gets the value (as defined by jQuery, ex. attr)
- *    element(selector, label).{method}(key, value) sets the value (as defined by jQuery, ex. attr)
- */
-angular.scenario.dsl('element', function() {
-  var KEY_VALUE_METHODS = ['attr', 'css', 'prop'];
-  var VALUE_METHODS = [
-    'val', 'text', 'html', 'height', 'innerHeight', 'outerHeight', 'width',
-    'innerWidth', 'outerWidth', 'position', 'scrollLeft', 'scrollTop', 'offset'
-  ];
-  var chain = {};
-
-  chain.count = function() {
-    return this.addFutureAction('element \'' + this.label + '\' count',
-      function($window, $document, done) {
-        try {
-          done(null, $document.elements().length);
-        } catch (e) {
-          done(null, 0);
-        }
-    });
-  };
-
-  chain.click = function() {
-    return this.addFutureAction('element \'' + this.label + '\' click',
-      function($window, $document, done) {
-        var elements = $document.elements();
-        var href = elements.attr('href');
-        var eventProcessDefault = elements.trigger('click')[0];
-
-        if (href && elements[0].nodeName.toLowerCase() === 'a' && eventProcessDefault) {
-          this.application.navigateTo(href, function() {
-            done();
-          }, done);
-        } else {
-          done();
-        }
-    });
-  };
-
-  chain.dblclick = function() {
-    return this.addFutureAction('element \'' + this.label + '\' dblclick',
-      function($window, $document, done) {
-        var elements = $document.elements();
-        var href = elements.attr('href');
-        var eventProcessDefault = elements.trigger('dblclick')[0];
-
-        if (href && elements[0].nodeName.toLowerCase() === 'a' && eventProcessDefault) {
-          this.application.navigateTo(href, function() {
-            done();
-          }, done);
-        } else {
-          done();
-        }
-    });
-  };
-
-  chain.mouseover = function() {
-    return this.addFutureAction('element \'' + this.label + '\' mouseover',
-      function($window, $document, done) {
-        var elements = $document.elements();
-        elements.trigger('mouseover');
-        done();
-    });
-  };
-
-  chain.mousedown = function() {
-      return this.addFutureAction('element \'' + this.label + '\' mousedown',
-        function($window, $document, done) {
-          var elements = $document.elements();
-          elements.trigger('mousedown');
-          done();
-      });
-    };
-
-  chain.mouseup = function() {
-      return this.addFutureAction('element \'' + this.label + '\' mouseup',
-        function($window, $document, done) {
-          var elements = $document.elements();
-          elements.trigger('mouseup');
-          done();
-      });
-    };
-
-  chain.query = function(fn) {
-    return this.addFutureAction('element ' + this.label + ' custom query',
-      function($window, $document, done) {
-        fn.call(this, $document.elements(), done);
-    });
-  };
-
-  angular.forEach(KEY_VALUE_METHODS, function(methodName) {
-    chain[methodName] = function(name, value) {
-      var args = arguments,
-          futureName = (args.length === 1)
-              ? 'element \'' + this.label + '\' get ' + methodName + ' \'' + name + '\''
-              : 'element \'' + this.label + '\' set ' + methodName + ' \'' + name + '\' to \'' +
-                value + '\'';
-
-      return this.addFutureAction(futureName, function($window, $document, done) {
-        var element = $document.elements();
-        done(null, element[methodName].apply(element, args));
-      });
-    };
-  });
-
-  angular.forEach(VALUE_METHODS, function(methodName) {
-    chain[methodName] = function(value) {
-      var args = arguments,
-          futureName = (args.length === 0)
-              ? 'element \'' + this.label + '\' ' + methodName
-              : 'element \'' + this.label + '\' set ' + methodName + ' to \'' + value + '\'';
-
-      return this.addFutureAction(futureName, function($window, $document, done) {
-        var element = $document.elements();
-        done(null, element[methodName].apply(element, args));
-      });
-    };
-  });
-
-  return function(selector, label) {
-    this.dsl.using(selector, label);
-    return chain;
-  };
-});
diff --git a/src/ngScenario/matchers.js b/src/ngScenario/matchers.js
deleted file mode 100644
index f2dea6f1de40..000000000000
--- a/src/ngScenario/matchers.js
+++ /dev/null
@@ -1,45 +0,0 @@
-'use strict';
-
-/**
- * Matchers for implementing specs. Follows the Jasmine spec conventions.
- */
-
-angular.scenario.matcher('toEqual', /** @this */ function(expected) {
-  return angular.equals(this.actual, expected);
-});
-
-angular.scenario.matcher('toBe', /** @this */ function(expected) {
-  return this.actual === expected;
-});
-
-angular.scenario.matcher('toBeDefined', /** @this */ function() {
-  return angular.isDefined(this.actual);
-});
-
-angular.scenario.matcher('toBeTruthy', /** @this */ function() {
-  return this.actual;
-});
-
-angular.scenario.matcher('toBeFalsy', /** @this */ function() {
-  return !this.actual;
-});
-
-angular.scenario.matcher('toMatch', /** @this */ function(expected) {
-  return new RegExp(expected).test(this.actual);
-});
-
-angular.scenario.matcher('toBeNull', /** @this */ function() {
-  return this.actual === null;
-});
-
-angular.scenario.matcher('toContain', /** @this */ function(expected) {
-  return includes(this.actual, expected);
-});
-
-angular.scenario.matcher('toBeLessThan', /** @this */ function(expected) {
-  return this.actual < expected;
-});
-
-angular.scenario.matcher('toBeGreaterThan', /** @this */ function(expected) {
-  return this.actual > expected;
-});
diff --git a/src/ngScenario/output/Html.js b/src/ngScenario/output/Html.js
deleted file mode 100644
index dcd87a3f76b5..000000000000
--- a/src/ngScenario/output/Html.js
+++ /dev/null
@@ -1,171 +0,0 @@
-'use strict';
-
-/**
- * User Interface for the Scenario Runner.
- *
- * TODO(esprehn): This should be refactored now that ObjectModel exists
- *  to use AngularJS bindings for the UI.
- */
-angular.scenario.output('html', function(context, runner, model) {
-  var specUiMap = {},
-      lastStepUiMap = {};
-
-  context.append(
-    '<div id="header">' +
-    '  <h1><span class="angular">AngularJS</span>: Scenario Test Runner</h1>' +
-    '  <ul id="status-legend" class="status-display">' +
-    '    <li class="status-error">0 Errors</li>' +
-    '    <li class="status-failure">0 Failures</li>' +
-    '    <li class="status-success">0 Passed</li>' +
-    '  </ul>' +
-    '</div>' +
-    '<div id="specs">' +
-    '  <div class="test-children"></div>' +
-    '</div>'
-  );
-
-  runner.on('InteractivePause', function(spec) {
-    var ui = lastStepUiMap[spec.id];
-    ui.find('.test-title').
-      html('paused... <a href="javascript:resume()">resume</a> when ready.');
-  });
-
-  runner.on('SpecBegin', function(spec) {
-    var ui = findContext(spec);
-    ui.find('> .tests').append(
-      '<li class="status-pending test-it"></li>'
-    );
-    ui = ui.find('> .tests li:last');
-    ui.append(
-      '<div class="test-info">' +
-      '  <p class="test-title">' +
-      '    <span class="timer-result"></span>' +
-      '    <span class="test-name"></span>' +
-      '  </p>' +
-      '</div>' +
-      '<div class="scrollpane">' +
-      '  <ol class="test-actions"></ol>' +
-      '</div>'
-    );
-    ui.find('> .test-info .test-name').text(spec.name);
-    ui.find('> .test-info').click(function() {
-      var scrollpane = ui.find('> .scrollpane');
-      var actions = scrollpane.find('> .test-actions');
-      var name = context.find('> .test-info .test-name');
-      if (actions.find(':visible').length) {
-        actions.hide();
-        name.removeClass('open').addClass('closed');
-      } else {
-        actions.show();
-        scrollpane.attr('scrollTop', scrollpane.attr('scrollHeight'));
-        name.removeClass('closed').addClass('open');
-      }
-    });
-
-    specUiMap[spec.id] = ui;
-  });
-
-  runner.on('SpecError', function(spec, error) {
-    var ui = specUiMap[spec.id];
-    ui.append('<pre></pre>');
-    ui.find('> pre').text(formatException(error));
-  });
-
-  runner.on('SpecEnd', function(spec) {
-    var ui = specUiMap[spec.id];
-    spec = model.getSpec(spec.id);
-    ui.removeClass('status-pending');
-    ui.addClass('status-' + spec.status);
-    ui.find('> .test-info .timer-result').text(spec.duration + 'ms');
-    if (spec.status === 'success') {
-      ui.find('> .test-info .test-name').addClass('closed');
-      ui.find('> .scrollpane .test-actions').hide();
-    }
-    updateTotals(spec.status);
-  });
-
-  runner.on('StepBegin', function(spec, step) {
-    var ui = specUiMap[spec.id];
-    spec = model.getSpec(spec.id);
-    step = spec.getLastStep();
-    ui.find('> .scrollpane .test-actions').append('<li class="status-pending"></li>');
-    var stepUi = lastStepUiMap[spec.id] = ui.find('> .scrollpane .test-actions li:last');
-    stepUi.append(
-      '<div class="timer-result"></div>' +
-      '<div class="test-title"></div>'
-    );
-    stepUi.find('> .test-title').text(step.name);
-    var scrollpane = stepUi.parents('.scrollpane');
-    scrollpane.attr('scrollTop', scrollpane.attr('scrollHeight'));
-  });
-
-  runner.on('StepFailure', function(spec, step, error) {
-    var ui = lastStepUiMap[spec.id];
-    addError(ui, step.line, error);
-  });
-
-  runner.on('StepError', function(spec, step, error) {
-    var ui = lastStepUiMap[spec.id];
-    addError(ui, step.line, error);
-  });
-
-  runner.on('StepEnd', function(spec, step) {
-    var stepUi = lastStepUiMap[spec.id];
-    spec = model.getSpec(spec.id);
-    step = spec.getLastStep();
-    stepUi.find('.timer-result').text(step.duration + 'ms');
-    stepUi.removeClass('status-pending');
-    stepUi.addClass('status-' + step.status);
-    var scrollpane = specUiMap[spec.id].find('> .scrollpane');
-    scrollpane.attr('scrollTop', scrollpane.attr('scrollHeight'));
-  });
-
-  /**
-   * Finds the context of a spec block defined by the passed definition.
-   *
-   * @param {Object} The definition created by the Describe object.
-   */
-  function findContext(spec) {
-    var currentContext = context.find('#specs');
-    angular.forEach(model.getDefinitionPath(spec), function(defn) {
-      var id = 'describe-' + defn.id;
-      if (!context.find('#' + id).length) {
-        currentContext.find('> .test-children').append(
-          '<div class="test-describe" id="' + id + '">' +
-          '  <h2></h2>' +
-          '  <div class="test-children"></div>' +
-          '  <ul class="tests"></ul>' +
-          '</div>'
-        );
-        context.find('#' + id).find('> h2').text('describe: ' + defn.name);
-      }
-      currentContext = context.find('#' + id);
-    });
-    return context.find('#describe-' + spec.definition.id);
-  }
-
-  /**
-   * Updates the test counter for the status.
-   *
-   * @param {string} the status.
-   */
-  function updateTotals(status) {
-    var legend = context.find('#status-legend .status-' + status);
-    var parts = legend.text().split(' ');
-    var value = (parts[0] * 1) + 1;
-    legend.text(value + ' ' + parts[1]);
-  }
-
-  /**
-   * Add an error to a step.
-   *
-   * @param {Object} The JQuery wrapped context
-   * @param {function()} fn() that should return the file/line number of the error
-   * @param {Object} the error.
-   */
-  function addError(context, line, error) {
-    context.find('.test-title').append('<pre></pre>');
-    var message = _jQuery.trim(line() + '\n\n' + formatException(error));
-    context.find('.test-title pre:last').text(message);
-  }
-});
diff --git a/src/ngScenario/output/Json.js b/src/ngScenario/output/Json.js
deleted file mode 100644
index c024d923aab9..000000000000
--- a/src/ngScenario/output/Json.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-/**
- * Generates JSON output into a context.
- */
-angular.scenario.output('json', function(context, runner, model) {
-  model.on('RunnerEnd', function() {
-    context.text(angular.toJson(model.value));
-  });
-});
diff --git a/src/ngScenario/output/Object.js b/src/ngScenario/output/Object.js
deleted file mode 100644
index 621b816f3253..000000000000
--- a/src/ngScenario/output/Object.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-/**
- * Creates a global value $result with the result of the runner.
- */
-angular.scenario.output('object', function(context, runner, model) {
-  runner.$window.$result = model.value;
-});
diff --git a/src/ngScenario/output/Xml.js b/src/ngScenario/output/Xml.js
deleted file mode 100644
index cfd04f5e529d..000000000000
--- a/src/ngScenario/output/Xml.js
+++ /dev/null
@@ -1,54 +0,0 @@
-'use strict';
-
-/**
- * Generates XML output into a context.
- */
-angular.scenario.output('xml', function(context, runner, model) {
-  var $ = function(args) {
-    // eslint-disable-next-line new-cap
-    return new context.init(args);
-  };
-  model.on('RunnerEnd', function() {
-    var scenario = $('<scenario></scenario>');
-    context.append(scenario);
-    serializeXml(scenario, model.value);
-  });
-
-  /**
-   * Convert the tree into XML.
-   *
-   * @param {Object} context jQuery context to add the XML to.
-   * @param {Object} tree node to serialize
-   */
-  function serializeXml(context, tree) {
-     angular.forEach(tree.children, function(child) {
-       var describeContext = $('<describe></describe>');
-       describeContext.attr('id', child.id);
-       describeContext.attr('name', child.name);
-       context.append(describeContext);
-       serializeXml(describeContext, child);
-     });
-     var its = $('<its></its>');
-     context.append(its);
-     angular.forEach(tree.specs, function(spec) {
-       var it = $('<it></it>');
-       it.attr('id', spec.id);
-       it.attr('name', spec.name);
-       it.attr('duration', spec.duration);
-       it.attr('status', spec.status);
-       its.append(it);
-       angular.forEach(spec.steps, function(step) {
-         var stepContext = $('<step></step>');
-         stepContext.attr('name', step.name);
-         stepContext.attr('duration', step.duration);
-         stepContext.attr('status', step.status);
-         it.append(stepContext);
-         if (step.error) {
-           var error = $('<error></error>');
-           stepContext.append(error);
-           error.text(formatException(step.error));
-         }
-       });
-     });
-   }
-});
diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
index afc869074a78..9c58807345d3 100644
--- a/test/ng/directive/inputSpec.js
+++ b/test/ng/directive/inputSpec.js
@@ -422,8 +422,7 @@ describe('input', function() {
 
             scope.field = 'fake field';
             scope.$watch('field', function() {
-              // We need to use _originalTrigger since trigger is modified by AngularJS Scenario.
-              inputElm._originalTrigger('change');
+              inputElm.trigger('change');
             });
             scope.$apply();
           };
diff --git a/test/ngScenario/ApplicationSpec.js b/test/ngScenario/ApplicationSpec.js
deleted file mode 100644
index 176f5b0a8ce0..000000000000
--- a/test/ngScenario/ApplicationSpec.js
+++ /dev/null
@@ -1,244 +0,0 @@
-'use strict';
-
-describe('angular.scenario.Application', function() {
-  var $window;
-  var app, frames;
-
-  function callLoadHandlers(app) {
-    var handler = app.getFrame_().triggerHandler('load');
-  }
-
-  beforeEach(function() {
-    window.document.body.innerHTML = '';
-    frames = _jQuery('<div></div>');
-    _jQuery(window.document.body).append(frames);
-    app = new angular.scenario.Application(frames);
-  });
-
-
-  afterEach(function() {
-    _jQuery('iframe').off(); // cleanup any leftover onload handlers
-    window.document.body.innerHTML = '';
-  });
-
-
-  it('should return new $window and $document after navigateTo', function() {
-    var called;
-    var testWindow, testDocument, counter = 0;
-    app.getWindow_ = function() {
-      return {x:counter++, document:{x:counter++}};
-    };
-    app.navigateTo('http://www.google.com/');
-    app.executeAction(function($window, $document) {
-      testWindow = $window;
-      testDocument = $document;
-    });
-    app.navigateTo('http://www.google.com/');
-    app.executeAction(function($window, $document) {
-      expect($window).not.toEqual(testWindow);
-      expect($document).not.toEqual(testDocument);
-      called = true;
-    });
-    expect(called).toBeTruthy();
-  });
-
-  it('should execute callback with correct arguments', function() {
-    var called;
-    var testWindow = {document: {}};
-    app.getWindow_ = function() {
-      return testWindow;
-    };
-    app.executeAction(function($window, $document) {
-      expect(this).toEqual(app);
-      expect($document).toEqual(_jQuery($window.document));
-      expect($window).toEqual(testWindow);
-      called = true;
-    });
-    expect(called).toBeTruthy();
-  });
-
-  it('should use a new iframe each time', function() {
-    app.navigateTo('http://localhost/');
-    var frame = app.getFrame_();
-    frame.attr('test', true);
-    app.navigateTo('http://localhost/');
-    expect(app.getFrame_().attr('test')).toBeFalsy();
-  });
-
-  it('should call error handler if document not accessible', function() {
-    var called;
-    app.getWindow_ = function() {
-      return {};
-    };
-    app.navigateTo('http://localhost/', angular.noop, function(error) {
-      expect(error).toMatch(/Sandbox Error/);
-      called = true;
-    });
-    callLoadHandlers(app);
-    expect(called).toBeTruthy();
-  });
-
-  it('should call error handler if navigating to about:blank', function() {
-    var called;
-    app.navigateTo('about:blank', angular.noop, function(error) {
-      expect(error).toMatch(/Sandbox Error/);
-      called = true;
-    });
-    expect(called).toBeTruthy();
-  });
-
-  it('should remove old iframes', function() {
-    app.navigateTo('http://localhost/#foo');
-    frames.find('iframe')[0].id = 'test';
-
-    app.navigateTo('http://localhost/#bar');
-    var iframes = frames.find('iframe');
-
-    expect(iframes.length).toEqual(1);
-    expect(iframes[0].src).toEqual('http://localhost/#bar');
-    expect(iframes[0].id).toBeFalsy();
-  });
-
-  it('should URL update description bar', function() {
-    app.navigateTo('http://localhost/');
-    var anchor = frames.find('> h2 a');
-    expect(anchor.attr('href')).toEqual('http://localhost/');
-    expect(anchor.text()).toEqual('http://localhost/');
-  });
-
-  it('should call onload handler when frame loads', function() {
-    var called;
-    app.getWindow_ = function() {
-      return {document: {}};
-    };
-    app.navigateTo('http://localhost/', function($window, $document) {
-      called = true;
-    });
-    callLoadHandlers(app);
-    expect(called).toBeTruthy();
-  });
-
-  it('should set rootElement when navigateTo instigates bootstrap', inject(function($injector, $browser) {
-    var called;
-    var testWindow = {
-      document: jqLite('<div class="test-foo"></div>')[0],
-      angular: {
-        element: jqLite,
-        service: {},
-        resumeBootstrap: noop
-      }
-    };
-    jqLite(testWindow.document).data('$injector', $injector);
-    var resumeBootstrapSpy = spyOn(testWindow.angular, 'resumeBootstrap').and.returnValue($injector);
-
-    var injectorGet = $injector.get;
-    spyOn($injector, 'get').and.callFake(function(name) {
-      switch (name) {
-        case '$rootElement': return jqLite(testWindow.document);
-        default: return injectorGet(name);
-      }
-    });
-
-    app.getWindow_ = function() {
-      return testWindow;
-    };
-    app.navigateTo('http://localhost/', noop);
-    callLoadHandlers(app);
-    expect(app.rootElement).toBe(testWindow.document);
-    expect(resumeBootstrapSpy).toHaveBeenCalled();
-    dealoc(testWindow.document);
-  }));
-
-  it('should set setup resumeDeferredBootstrap if resumeBootstrap is not yet defined', inject(function($injector, $browser) {
-    var called;
-    var testWindow = {
-      document: jqLite('<div class="test-foo"></div>')[0],
-      angular: {
-        element: jqLite,
-        service: {},
-        resumeBootstrap: null
-      }
-    };
-    jqLite(testWindow.document).data('$injector', $injector);
-
-    var injectorGet = $injector.get;
-    var injectorSpy = spyOn($injector, 'get').and.callFake(function(name) {
-      switch (name) {
-        case '$rootElement': return jqLite(testWindow.document);
-        default: return injectorGet(name);
-      }
-    });
-
-    app.getWindow_ = function() {
-      return testWindow;
-    };
-    app.navigateTo('http://localhost/', noop);
-    expect(testWindow.angular.resumeDeferredBootstrap).toBeUndefined();
-    callLoadHandlers(app);
-    expect(testWindow.angular.resumeDeferredBootstrap).toBeDefined();
-    expect(app.rootElement).toBeUndefined();
-    expect(injectorSpy).not.toHaveBeenCalled();
-
-    var resumeBootstrapSpy = spyOn(testWindow.angular, 'resumeBootstrap').and.returnValue($injector);
-    testWindow.angular.resumeDeferredBootstrap();
-    expect(app.rootElement).toBe(testWindow.document);
-    expect(resumeBootstrapSpy).toHaveBeenCalled();
-    expect(injectorSpy).toHaveBeenCalledWith('$rootElement');
-    dealoc(testWindow.document);
-  }));
-
-  it('should wait for pending requests in executeAction', inject(function($injector, $browser) {
-    var called, polled;
-    var handlers = [];
-    var testWindow = {
-      document: jqLite('<div class="test-foo" ng-app></div>')[0],
-      angular: {
-        element: jqLite,
-        service: {}
-      }
-    };
-    $browser.notifyWhenNoOutstandingRequests = function(fn) {
-      handlers.push(fn);
-    };
-    jqLite(testWindow.document).data('$injector', $injector);
-    app.getWindow_ = function() {
-      return testWindow;
-    };
-    app.executeAction(function($window, $document) {
-      expect($window).toEqual(testWindow);
-      expect($document).toBeDefined();
-      expect($document[0].className).toEqual('test-foo');
-    });
-    expect(handlers.length).toEqual(1);
-    handlers[0]();
-    dealoc(testWindow.document);
-  }));
-
-  it('should allow explicit rootElement', inject(function($injector, $browser) {
-    var called, polled;
-    var handlers = [];
-    var testWindow = {
-      document: jqLite('<div class="test-foo"></div>')[0],
-      angular: {
-        element: jqLite,
-        service: {}
-      }
-    };
-    $browser.notifyWhenNoOutstandingRequests = function(fn) {
-      handlers.push(fn);
-    };
-    app.rootElement = testWindow.document;
-    jqLite(testWindow.document).data('$injector', $injector);
-    app.getWindow_ = function() {
-      return testWindow;
-    };
-    app.executeAction(function($window, $document) {
-      expect($window).toEqual(testWindow);
-      expect($document).toBeDefined();
-      expect($document[0].className).toEqual('test-foo');
-    });
-    expect(handlers.length).toEqual(1);
-    handlers[0]();
-    dealoc(testWindow.document);
-  }));
-});
diff --git a/test/ngScenario/DescribeSpec.js b/test/ngScenario/DescribeSpec.js
deleted file mode 100644
index b911ab75031a..000000000000
--- a/test/ngScenario/DescribeSpec.js
+++ /dev/null
@@ -1,123 +0,0 @@
-'use strict';
-
-describe('angular.scenario.Describe', function() {
-  var log;
-  var root;
-
-  beforeEach(function() {
-    root = new angular.scenario.Describe();
-
-    /**
-     * Simple callback logging system. Use to assert proper order of calls.
-     */
-    log = function(text) {
-      log.text = log.text + text;
-    };
-    log.fn = function(text) {
-      return function(done) {
-        log(text);
-        (done || angular.noop)();
-      };
-    };
-    log.reset = function() {
-      log.text = '';
-    };
-    log.reset();
-  });
-
-  it('should handle basic nested case', function() {
-    root.describe('A', function() {
-      this.beforeEach(log.fn('{'));
-      this.afterEach(log.fn('}'));
-      this.it('1', log.fn('1'));
-      this.describe('B', function() {
-        this.beforeEach(log.fn('('));
-        this.afterEach(log.fn(')'));
-        this.it('2', log.fn('2'));
-      });
-    });
-    var specs = root.getSpecs();
-    expect(specs.length).toEqual(2);
-
-    expect(specs[0].name).toEqual('2');
-    specs[0].before();
-    specs[0].body();
-    specs[0].after();
-    expect(log.text).toEqual('{(2)}');
-
-    log.reset();
-    expect(specs[1].name).toEqual('1');
-    specs[1].before();
-    specs[1].body();
-    specs[1].after();
-    expect(log.text).toEqual('{1}');
-  });
-
-  it('should link nested describe blocks with parent and children', function() {
-    root.describe('A', function() {
-      this.it('1', angular.noop);
-      this.describe('B', function() {
-        this.it('2', angular.noop);
-        this.describe('C', function() {
-          this.it('3', angular.noop);
-        });
-      });
-    });
-    var specs = root.getSpecs();
-    expect(specs[2].definition.parent).toEqual(root);
-    expect(specs[0].definition.parent).toEqual(specs[2].definition.children[0]);
-  });
-
-  it('should not process xit and xdescribe', function() {
-    root.describe('A', function() {
-      this.xit('1', angular.noop);
-      this.xdescribe('B', function() {
-        this.it('2', angular.noop);
-        this.describe('C', function() {
-          this.it('3', angular.noop);
-        });
-      });
-    });
-    var specs = root.getSpecs();
-    expect(specs.length).toEqual(0);
-  });
-
-
-  it('should only return iit and ddescribe if present', function() {
-    root.describe('A', function() {
-      this.it('1', angular.noop);
-      this.iit('2', angular.noop);
-      this.describe('B', function() {
-        this.it('3', angular.noop);
-        this.ddescribe('C', function() {
-          this.it('4', angular.noop);
-          this.describe('D', function() {
-            this.it('5', angular.noop);
-          });
-        });
-      });
-    });
-    var specs = root.getSpecs();
-    expect(specs.length).toEqual(3);
-    expect(specs[0].name).toEqual('5');
-    expect(specs[1].name).toEqual('4');
-    expect(specs[2].name).toEqual('2');
-  });
-
-  it('should create uniqueIds in the tree', function() {
-    angular.scenario.Describe.id = 0;
-    var a = new angular.scenario.Describe();
-    var b = new angular.scenario.Describe();
-    expect(a.id).not.toEqual(b.id);
-  });
-
-  it('should create uniqueIds for each spec', function() {
-    var d = new angular.scenario.Describe();
-    d.it('fake', function() {});
-    d.it('fake', function() {});
-
-    expect(d.its[0].id).toBeDefined();
-    expect(d.its[1].id).toBeDefined();
-    expect(d.its[0].id).not.toEqual(d.its[1].id);
-  });
-});
diff --git a/test/ngScenario/FutureSpec.js b/test/ngScenario/FutureSpec.js
deleted file mode 100644
index 9ae284dc8e17..000000000000
--- a/test/ngScenario/FutureSpec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-'use strict';
-
-describe('angular.scenario.Future', function() {
-  var future;
-
-  it('should set the sane defaults', function() {
-    var behavior = function() {};
-    var future = new angular.scenario.Future('test name', behavior, 'foo');
-    expect(future.name).toEqual('test name');
-    expect(future.behavior).toEqual(behavior);
-    expect(future.line).toEqual('foo');
-    expect(future.value).toBeUndefined();
-    expect(future.fulfilled).toBeFalsy();
-    expect(future.parser).toEqual(angular.identity);
-  });
-
-  it('should be fulfilled after execution and done callback', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done();
-    });
-    future.execute(angular.noop);
-    expect(future.fulfilled).toBeTruthy();
-  });
-
-  it('should take callback with (error, result) and forward', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(10, 20);
-    });
-    future.execute(function(error, result) {
-      expect(error).toEqual(10);
-      expect(result).toEqual(20);
-    });
-  });
-
-  it('should use error as value if provided', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(10, 20);
-    });
-    future.execute(angular.noop);
-    expect(future.value).toEqual(10);
-  });
-
-  it('should parse json with fromJson', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(null, '{"test": "foo"}');
-    });
-    future.fromJson().execute(angular.noop);
-    expect(future.value).toEqual({test: 'foo'});
-  });
-
-  it('should convert to json with toJson', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(null, {test: 'foo'});
-    });
-    future.toJson().execute(angular.noop);
-    expect(future.value).toEqual('{"test":"foo"}');
-  });
-
-  it('should convert with custom parser', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(null, 'foo');
-    });
-    future.parsedWith(function(value) {
-      return value.toUpperCase();
-    }).execute(angular.noop);
-    expect(future.value).toEqual('FOO');
-  });
-
-  it('should pass error if parser fails', function() {
-    var future = new angular.scenario.Future('test name', function(done) {
-      done(null, '{');
-    });
-    future.fromJson().execute(function(error, result) {
-      expect(error).toBeDefined();
-    });
-  });
-});
diff --git a/test/ngScenario/ObjectModelSpec.js b/test/ngScenario/ObjectModelSpec.js
deleted file mode 100644
index 749041451753..000000000000
--- a/test/ngScenario/ObjectModelSpec.js
+++ /dev/null
@@ -1,333 +0,0 @@
-'use strict';
-
-describe('angular.scenario.ObjectModel', function() {
-  var model;
-  var runner;
-  var spec, step;
-
-  function buildSpec(id, name, definitions) {
-    var spec = {
-      id: id,
-      name: name,
-      definition: {
-        name: definitions.shift()
-      }
-    };
-    var currentDef = spec.definition;
-
-    forEach(definitions, function(defName) {
-      currentDef.parent = {
-        name: defName
-      };
-      currentDef = currentDef.parent;
-    });
-
-    return spec;
-  }
-
-  function buildStep(name, line) {
-    return {
-      name: name || 'test step',
-      line: function() { return line || ''; }
-    };
-  }
-
-  beforeEach(function() {
-    spec = buildSpec(1, 'test spec', ['describe 1']);
-    step = buildStep();
-    runner = new angular.scenario.testing.MockRunner();
-    model = new angular.scenario.ObjectModel(runner);
-  });
-
-  it('should value default empty value', function() {
-    expect(model.value).toEqual({
-      name: '',
-      children: {}
-    });
-  });
-
-  it('should add spec and create describe blocks on SpecBegin event', function() {
-    runner.emit('SpecBegin', buildSpec(1, 'test spec', ['describe 2', 'describe 1']));
-
-    expect(model.value.children['describe 1']).toBeDefined();
-    expect(model.value.children['describe 1'].children['describe 2']).toBeDefined();
-    expect(model.value.children['describe 1'].children['describe 2'].specs['test spec']).toBeDefined();
-  });
-
-  it('should set fullDefinitionName on SpecBegin event', function() {
-    runner.emit('SpecBegin', buildSpec(1, 'fake spec', ['describe 2']));
-    var spec = model.getSpec(1);
-
-    expect(spec.fullDefinitionName).toBeDefined();
-    expect(spec.fullDefinitionName).toEqual('describe 2');
-  });
-
-  it('should set fullDefinitionName on SpecBegin event (join more names by space)', function() {
-    runner.emit('SpecBegin', buildSpec(1, 'fake spec', ['describe 2', 'describe 1']));
-    var spec = model.getSpec(1);
-
-    expect(spec.fullDefinitionName).toEqual('describe 1 describe 2');
-  });
-
-  it('should add step to spec on StepBegin', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].steps.length).toEqual(1);
-  });
-
-  it('should update spec timer duration on SpecEnd event', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].duration).toBeDefined();
-  });
-
-  it('should update step timer duration on StepEnd event', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].steps[0].duration).toBeDefined();
-  });
-
-  it('should set spec status on SpecEnd to success if no status set', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].status).toEqual('success');
-  });
-
-  it('should set status to error after SpecError', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('SpecError', spec, 'error');
-
-    expect(model.value.children['describe 1'].specs['test spec'].status).toEqual('error');
-  });
-
-  it('should set spec status to failure if step fails', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepFailure', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].status).toEqual('failure');
-  });
-
-  it('should set spec status to error if step errors', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepError', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepFailure', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    expect(model.value.children['describe 1'].specs['test spec'].status).toEqual('error');
-  });
-
-  describe('events', function() {
-    var Spec = angular.scenario.ObjectModel.Spec,
-        Step = angular.scenario.ObjectModel.Step,
-        callback;
-
-    beforeEach(function() {
-      callback = jasmine.createSpy('listener');
-    });
-
-    it('should provide method for registering a listener', function() {
-      expect(model.on).toBeDefined();
-      expect(model.on instanceof Function).toBe(true);
-    });
-
-    it('should forward SpecBegin event', function() {
-      model.on('SpecBegin', callback);
-      runner.emit('SpecBegin', spec);
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward SpecBegin event with ObjectModel.Spec as a param', function() {
-      model.on('SpecBegin', callback);
-      runner.emit('SpecBegin', spec);
-
-      expect(callback.calls.mostRecent().args[0] instanceof Spec).toBe(true);
-      expect(callback.calls.mostRecent().args[0].name).toEqual(spec.name);
-    });
-
-    it('should forward SpecError event', function() {
-      model.on('SpecError', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('SpecError', spec, {});
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward SpecError event with ObjectModel.Spec and error as a params', function() {
-      var error = {};
-      model.on('SpecError', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('SpecError', spec, error);
-
-      var param = callback.calls.mostRecent().args[0];
-      expect(param instanceof Spec).toBe(true);
-      expect(param.name).toEqual(spec.name);
-      expect(param.status).toEqual('error');
-      expect(param.error).toBe(error);
-    });
-
-    it('should forward SpecEnd event', function() {
-      model.on('SpecEnd', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('SpecEnd', spec);
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward SpecEnd event with ObjectModel.Spec as a param', function() {
-      model.on('SpecEnd', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('SpecEnd', spec);
-
-      expect(callback.calls.mostRecent().args[0] instanceof Spec).toBe(true);
-      expect(callback.calls.mostRecent().args[0].name).toEqual(spec.name);
-    });
-
-    it('should forward StepBegin event', function() {
-      model.on('StepBegin', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward StepBegin event with Spec and Step as params', function() {
-      model.on('StepBegin', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-
-      var params = callback.calls.mostRecent().args;
-      expect(params[0] instanceof Spec).toBe(true);
-      expect(params[0].name).toEqual(spec.name);
-      expect(params[1] instanceof Step).toBe(true);
-    });
-
-    it('should forward StepError event', function() {
-      model.on('StepError', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepError', spec, step, {});
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward StepError event with Spec, Step and error as params', function() {
-      var error = {};
-      model.on('StepError', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepError', spec, step, error);
-
-      var params = callback.calls.mostRecent().args;
-      expect(params[0] instanceof Spec).toBe(true);
-      expect(params[0].name).toEqual(spec.name);
-      expect(params[1] instanceof Step).toBe(true);
-      expect(params[1].status).toEqual('error');
-      expect(params[2]).toBe(error);
-    });
-
-    it('should forward StepFailure event', function() {
-      model.on('StepFailure', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepFailure', spec, step, {});
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward StepFailure event with Spec, Step and error as params', function() {
-      var error = {};
-      model.on('StepFailure', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepFailure', spec, step, error);
-
-      var params = callback.calls.mostRecent().args;
-      expect(params[0] instanceof Spec).toBe(true);
-      expect(params[0].name).toEqual(spec.name);
-      expect(params[1] instanceof Step).toBe(true);
-      expect(params[1].status).toEqual('failure');
-      expect(params[2]).toBe(error);
-    });
-
-    it('should forward StepEnd event', function() {
-      model.on('StepEnd', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepEnd', spec, step);
-
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should forward StepEnd event with Spec and Step as params', function() {
-      model.on('StepEnd', callback);
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepEnd', spec, step);
-
-      var params = callback.calls.mostRecent().args;
-      expect(params[0] instanceof Spec).toBe(true);
-      expect(params[0].name).toEqual(spec.name);
-      expect(params[1] instanceof Step).toBe(true);
-    });
-
-    it('should forward RunnerEnd event', function() {
-      model.on('RunnerEnd', callback);
-      runner.emit('RunnerEnd');
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('should set error of first failure', function() {
-      var error = 'first-error',
-          step2 = buildStep();
-
-      model.on('SpecEnd', function(spec) {
-        expect(spec.error).toBeDefined();
-        expect(spec.error).toBe(error);
-      });
-
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepFailure', spec, step, error);
-      runner.emit('StepBegin', spec, step2);
-      runner.emit('StepFailure', spec, step2, 'second-error');
-      runner.emit('SpecEnd', spec);
-    });
-
-    it('should set line number of first failure', function() {
-      var step = buildStep('fake', 'first-line'),
-          step2 = buildStep('fake2', 'second-line');
-
-      model.on('SpecEnd', function(spec) {
-        expect(spec.line).toBeDefined();
-        expect(spec.line).toBe('first-line');
-      });
-
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepFailure', spec, step, null);
-      runner.emit('StepBegin', spec, step2);
-      runner.emit('StepFailure', spec, step2, null);
-      runner.emit('SpecEnd', spec);
-    });
-  });
-});
diff --git a/test/ngScenario/RunnerSpec.js b/test/ngScenario/RunnerSpec.js
deleted file mode 100644
index 3de151a55d27..000000000000
--- a/test/ngScenario/RunnerSpec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-'use strict';
-
-/**
- * Mock spec runner.
- */
-function MockSpecRunner() {}
-MockSpecRunner.prototype.run = function(spec, specDone) {
-  spec.before.call(this);
-  spec.body.call(this);
-  spec.after.call(this);
-  specDone();
-};
-
-MockSpecRunner.prototype.addFuture = function(name, fn, line) {
-  return {name: name, fn: fn, line: line};
-};
-
-describe('angular.scenario.Runner', function() {
-  var $window;
-  var runner;
-
-  beforeEach(function() {
-    // Trick to get the scope out of a DSL statement
-    angular.scenario.dsl('dslAddFuture', function() {
-      return function() {
-        return this.addFuture('future name', angular.noop);
-      };
-    });
-    // Trick to get the scope out of a DSL statement
-    angular.scenario.dsl('dslScope', function() {
-      var scope = this;
-      return function() { return scope; };
-    });
-    // Trick to get the scope out of a DSL statement
-    angular.scenario.dsl('dslChain', function() {
-      return function() {
-        this.chained = 0;
-        this.chain = function() { this.chained++; return this; };
-        return this;
-      };
-    });
-    $window = {
-      location: {}
-    };
-    runner = new angular.scenario.Runner($window);
-    runner.on('SpecError', angular.mock.rethrow);
-    runner.on('StepError', angular.mock.rethrow);
-  });
-
-  afterEach(function() {
-    delete angular.scenario.dsl.dslScope;
-    delete angular.scenario.dsl.dslChain;
-  });
-
-  it('should publish the functions in the public API', function() {
-    angular.forEach(runner.api, function(fn, name) {
-      var func;
-      if (name in $window) {
-        func = $window[name];
-      }
-      expect(angular.isFunction(func)).toBeTruthy();
-    });
-  });
-
-  it('should construct valid describe trees with public API', function() {
-    var before = [];
-    var after = [];
-    $window.describe('A', function() {
-      $window.beforeEach(function() { before.push('A'); });
-      $window.afterEach(function() { after.push('A'); });
-      $window.it('1', angular.noop);
-      $window.describe('B', function() {
-        $window.beforeEach(function() { before.push('B'); });
-        $window.afterEach(function() { after.push('B'); });
-        $window.it('2', angular.noop);
-        $window.describe('C', function() {
-          $window.beforeEach(function() { before.push('C'); });
-          $window.afterEach(function() { after.push('C'); });
-          $window.it('3', angular.noop);
-        });
-      });
-    });
-    var specs = runner.rootDescribe.getSpecs();
-    specs[0].before();
-    specs[0].body();
-    specs[0].after();
-    expect(before).toEqual(['A', 'B', 'C']);
-    expect(after).toEqual(['C', 'B', 'A']);
-    expect(specs[2].definition.parent).toEqual(runner.rootDescribe);
-    expect(specs[0].definition.parent).toEqual(specs[2].definition.children[0]);
-  });
-
-  it('should publish the DSL statements to the $window', function() {
-    $window.describe('describe', function() {
-      $window.it('1', function() {
-        expect($window.dslScope).toBeDefined();
-      });
-    });
-    runner.run(null/*application*/);
-  });
-
-  it('should create a new scope for each DSL chain', function() {
-    $window.describe('describe', function() {
-      $window.it('1', function() {
-        var scope = $window.dslScope();
-        scope.test = 'foo';
-        expect($window.dslScope().test).toBeUndefined();
-      });
-      $window.it('2', function() {
-        var scope = $window.dslChain().chain().chain();
-        expect(scope.chained).toEqual(2);
-      });
-    });
-    runner.run(null/*application*/);
-  });
-});
diff --git a/test/ngScenario/ScenarioSpec.js b/test/ngScenario/ScenarioSpec.js
deleted file mode 100644
index d3451a2ba327..000000000000
--- a/test/ngScenario/ScenarioSpec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-
-describe('ScenarioSpec: Compilation', function() {
-  var element;
-
-  afterEach(function() {
-    dealoc(element);
-  });
-
-
-  describe('compilation', function() {
-    it('should compile dom node and return scope', inject(function($rootScope, $compile) {
-      var node = jqLite('<div ng-init="a=1">{{b=a+1}}</div>')[0];
-      element = $compile(node)($rootScope);
-      $rootScope.$digest();
-      expect($rootScope.a).toEqual(1);
-      expect($rootScope.b).toEqual(2);
-    }));
-
-    it('should compile jQuery node and return scope', inject(function($rootScope, $compile) {
-      element = $compile(jqLite('<div>{{a=123}}</div>'))($rootScope);
-      $rootScope.$digest();
-      expect(jqLite(element).text()).toEqual('123');
-    }));
-
-    it('should compile text node and return scope', inject(function($rootScope, $compile) {
-      element = $compile('<div>{{a=123}}</div>')($rootScope);
-      $rootScope.$digest();
-      expect(jqLite(element).text()).toEqual('123');
-    }));
-  });
-
-  describe('jQuery', function() {
-    it('should exist on the angular.scenario object', function() {
-      expect(angular.scenario.jQuery).toBeDefined();
-    });
-
-    it('should have common jQuery methods', function() {
-      var jQuery = angular.scenario.jQuery;
-      expect(typeof jQuery).toEqual('function');
-      expect(typeof jQuery('<div></div>').html).toEqual('function');
-    });
-  });
-});
diff --git a/test/ngScenario/SpecRunnerSpec.js b/test/ngScenario/SpecRunnerSpec.js
deleted file mode 100644
index 2e102ae2ea98..000000000000
--- a/test/ngScenario/SpecRunnerSpec.js
+++ /dev/null
@@ -1,177 +0,0 @@
-'use strict';
-
-/**
- * Mock Application
- */
-function ApplicationMock($window) {
-  this.$window = $window;
-}
-ApplicationMock.prototype = {
-  executeAction: function(callback) {
-    callback.call(this.$window, _jQuery(this.$window.document), this.$window);
-  }
-};
-
-describe('angular.scenario.SpecRunner', function() {
-  var $window, $root, log;
-  var runner;
-
-  function createSpec(name, body) {
-    return {
-      name: name,
-      before: angular.noop,
-      body: body || angular.noop,
-      after: angular.noop
-    };
-  }
-
-  beforeEach(inject(function($rootScope) {
-    log = [];
-    $window = {};
-    $window.setTimeout = function(fn, timeout) {
-      fn();
-    };
-    $root = $rootScope;
-    $root.emit = function(eventName) {
-      log.push(eventName);
-    };
-    $root.on = function(eventName) {
-      log.push('Listener Added for ' + eventName);
-    };
-    $root.application = new ApplicationMock($window);
-    $root.$window = $window;
-    runner = $root.$new();
-
-    var Cls = angular.scenario.SpecRunner;
-    for (var name in Cls.prototype) {
-      runner[name] = angular.bind(runner, Cls.prototype[name]);
-    }
-
-    Cls.call(runner);
-  }));
-
-  it('should bind futures to the spec', function() {
-    runner.addFuture('test future', function(done) {
-      this.value = 10;
-      done();
-    });
-    runner.futures[0].execute(angular.noop);
-    expect(runner.value).toEqual(10);
-  });
-
-  it('should pass done to future action behavior', function() {
-    runner.addFutureAction('test future', function($window, $document, done) {
-      expect(angular.isFunction(done)).toBeTruthy();
-      done(10, 20);
-    });
-    runner.futures[0].execute(function(error, result) {
-      expect(error).toEqual(10);
-      expect(result).toEqual(20);
-    });
-  });
-
-  it('should execute spec function and notify UI', function() {
-    var finished;
-    var spec = createSpec('test spec', function() {
-      this.test = 'some value';
-    });
-    runner.addFuture('test future', function(done) {
-      done();
-    });
-    runner.run(spec, function() {
-      finished = true;
-    });
-    expect(runner.test).toEqual('some value');
-    expect(finished).toBeTruthy();
-    expect(log).toEqual([
-      'SpecBegin',
-      'StepBegin',
-      'StepEnd',
-      'SpecEnd'
-    ]);
-  });
-
-  it('should execute notify UI on spec setup error', function() {
-    var finished;
-    var spec = createSpec('test spec', function() {
-      throw new Error('message');
-    });
-    runner.run(spec, function() {
-      finished = true;
-    });
-    expect(finished).toBeTruthy();
-    expect(log).toEqual([
-      'SpecBegin',
-      'SpecError',
-      'SpecEnd'
-    ]);
-  });
-
-  it('should execute notify UI on step failure', function() {
-    var finished;
-    var spec = createSpec('test spec');
-    runner.addFuture('test future', function(done) {
-      done('failure message');
-    });
-    runner.run(spec, function() {
-      finished = true;
-    });
-    expect(finished).toBeTruthy();
-    expect(log).toEqual([
-      'SpecBegin',
-      'StepBegin',
-      'StepFailure',
-      'StepEnd',
-      'SpecEnd'
-    ]);
-  });
-
-  it('should execute notify UI on step error', function() {
-    var finished;
-    var spec = createSpec('test spec', function() {
-      this.addFuture('test future', function(done) {
-        throw new Error('error message');
-      });
-    });
-    runner.run(spec, function() {
-      finished = true;
-    });
-    expect(finished).toBeTruthy();
-    expect(log).toEqual([
-      'SpecBegin',
-      'StepBegin',
-      'StepError',
-      'StepEnd',
-      'SpecEnd'
-    ]);
-  });
-
-  it('should run after handlers even if error in body of spec', function() {
-    var finished, after;
-    var spec = createSpec('test spec', function() {
-      this.addFuture('body', function(done) {
-        throw new Error('error message');
-      });
-    });
-    spec.after = function() {
-      this.addFuture('after', function(done) {
-        after = true;
-        done();
-      });
-    };
-    runner.run(spec, function() {
-      finished = true;
-    });
-    expect(finished).toBeTruthy();
-    expect(after).toBeTruthy();
-    expect(log).toEqual([
-      'SpecBegin',
-      'StepBegin',
-      'StepError',
-      'StepEnd',
-      'StepBegin',
-      'StepEnd',
-      'SpecEnd'
-    ]);
-  });
-});
diff --git a/test/ngScenario/dslSpec.js b/test/ngScenario/dslSpec.js
deleted file mode 100644
index 6eb5da68db0c..000000000000
--- a/test/ngScenario/dslSpec.js
+++ /dev/null
@@ -1,789 +0,0 @@
-'use strict';
-
-describe('angular.scenario.dsl', function() {
-  var element;
-  var $window, $root;
-  var eventLog;
-
-  afterEach(function() {
-    dealoc(element);
-  });
-
-  beforeEach(module('ngSanitize'));
-
-  beforeEach(inject(function($injector) {
-    eventLog = [];
-    $window = {
-      document: window.document.body,
-      angular: new angular.scenario.testing.MockAngular()
-    };
-    jqLite($window.document).data('$injector', $injector).attr('ng-app', '').addClass('html');
-    $root = $injector.get('$rootScope');
-    $root.emit = function(eventName) {
-      eventLog.push(eventName);
-    };
-    $root.on = function(eventName) {
-      eventLog.push('Listener Added for ' + eventName);
-    };
-    $root.futures = [];
-    $root.futureLog = [];
-    $root.$window = $window;
-    $root.addFuture = function(name, fn) {
-      this.futures.push(name);
-      fn.call(this, function(error, result) {
-        $root.futureError = error;
-        $root.futureResult = result;
-        $root.futureLog.push(name);
-      });
-    };
-    $root.dsl = {};
-    angular.forEach(angular.scenario.dsl, function(fn, name) {
-      $root.dsl[name] = function() {
-        return fn.call($root).apply($root, arguments);
-      };
-    });
-    $root.application = new angular.scenario.Application(jqLite($window.document));
-    $root.application.getWindow_ = function() {
-      return $window;
-    };
-    $root.application.navigateTo = function(url, callback) {
-      $window.location = url;
-      callback();
-    };
-    // Just use the real one since it delegates to this.addFuture
-    $root.addFutureAction = angular.scenario.
-      SpecRunner.prototype.addFutureAction;
-    jqLite($window.document).empty();
-  }));
-
-  afterEach(function() {
-    jqLite($window.document).removeData('$injector');
-  });
-
-  describe('Pause', function() {
-    it('should pause until resume to complete', function() {
-      expect($window.resume).toBeUndefined();
-      $root.dsl.pause();
-      expect(angular.isFunction($window.resume)).toBeTruthy();
-      expect($root.futureLog).toEqual([]);
-      $window.resume();
-      expect($root.futureLog).
-        toEqual(['pausing for you to resume']);
-      expect(eventLog).toContain('InteractivePause');
-    });
-  });
-
-  describe('Sleep', function() {
-    beforeEach(function() {
-      $root.$window.setTimeout = function(fn, value) {
-        $root.timerValue = value;
-        fn();
-      };
-    });
-
-    it('should sleep for specified seconds', function() {
-      $root.dsl.sleep(10);
-      expect($root.timerValue).toEqual(10000);
-      expect($root.futureResult).toEqual(10000);
-    });
-  });
-
-  describe('Expect', function() {
-    it('should chain and execute matcher', function() {
-      var future = {value: 10};
-      var result = $root.dsl.expect(future);
-      result.toEqual(10);
-      expect($root.futureError).toBeUndefined();
-      expect($root.futureResult).toBeUndefined();
-      result = $root.dsl.expect(future);
-      result.toEqual(20);
-      expect($root.futureError).toBeDefined();
-    });
-  });
-
-  describe('Browser', function() {
-    describe('Reload', function() {
-      it('should navigateTo', function() {
-        $window.location = {
-          href: '#foo'
-        };
-        $root.dsl.browser().reload();
-        expect($root.futureResult).toEqual('#foo');
-        expect($window.location).toEqual('#foo');
-      });
-    });
-
-    describe('NavigateTo', function() {
-      it('should allow a string url', function() {
-        $root.dsl.browser().navigateTo('http://myurl');
-        expect($window.location).toEqual('http://myurl');
-        expect($root.futureResult).toEqual('http://myurl');
-      });
-
-      it('should allow a future url', function() {
-        $root.dsl.browser().navigateTo('http://myurl', function() {
-          return 'http://futureUrl/';
-        });
-        expect($window.location).toEqual('http://futureUrl/');
-        expect($root.futureResult).toEqual('http://futureUrl/');
-      });
-
-      it('should complete if AngularJS is missing from app frame', function() {
-        delete $window.angular;
-        $root.dsl.browser().navigateTo('http://myurl');
-        expect($window.location).toEqual('http://myurl');
-        expect($root.futureResult).toEqual('http://myurl');
-      });
-    });
-
-    describe('window', function() {
-      beforeEach(function() {
-        $window.location = {
-          href: 'http://myurl/some/path?foo=10#/bar?x=2',
-          pathname: '/some/path',
-          search: '?foo=10',
-          hash: '#bar?x=2'
-        };
-      });
-
-      it('should return full URL for href', function() {
-        $root.dsl.browser().window().href();
-        expect($root.futureResult).toEqual($window.location.href);
-      });
-
-      it('should return the pathname', function() {
-        $root.dsl.browser().window().path();
-        expect($root.futureResult).toEqual($window.location.pathname);
-      });
-
-      it('should return the search part', function() {
-        $root.dsl.browser().window().search();
-        expect($root.futureResult).toEqual($window.location.search);
-      });
-
-      it('should return the hash without the #', function() {
-        $root.dsl.browser().window().hash();
-        expect($root.futureResult).toEqual('bar?x=2');
-      });
-    });
-
-    describe('location', function() {
-      beforeEach(inject(function($injector) {
-        angular.extend($injector.get('$location'), {
-          url: function() {return '/path?search=a#hhh';},
-          path: function() {return '/path';},
-          search: function() {return {search: 'a'};},
-          hash: function() {return 'hhh';}
-        });
-      }));
-
-      it('should return full url', function() {
-        $root.dsl.browser().location().url();
-        expect($root.futureResult).toEqual('/path?search=a#hhh');
-      });
-
-      it('should return the pathname', function() {
-        $root.dsl.browser().location().path();
-        expect($root.futureResult).toEqual('/path');
-      });
-
-      it('should return the query string as an object', function() {
-        $root.dsl.browser().location().search();
-        expect($root.futureResult).toEqual({search: 'a'});
-      });
-
-      it('should return the hash without the #', function() {
-        $root.dsl.browser().location().hash();
-        expect($root.futureResult).toEqual('hhh');
-      });
-    });
-  });
-
-  describe('Element Finding', function() {
-    var doc;
-    beforeEach(inject(function($injector) {
-      doc = _jQuery($window.document).append('<div class="body"></div>').find('.body');
-    }));
-
-    describe('Select', function() {
-      it('should select single option', function() {
-        doc.append(
-          '<select ng-model="test">' +
-          '  <option value=A>one</option>' +
-          '  <option value=B selected>two</option>' +
-          '</select>'
-        );
-        $root.dsl.select('test').option('A');
-        expect(doc.find('[ng-model="test"]').val()).toEqual('A');
-      });
-
-      it('should select single option using data-ng', function() {
-        doc.append(
-          '<select data-ng-model="test">' +
-          '  <option value=A>one</option>' +
-          '  <option value=B selected>two</option>' +
-          '</select>'
-        );
-        $root.dsl.select('test').option('A');
-        expect(doc.find('[data-ng-model="test"]').val()).toEqual('A');
-      });
-
-      it('should select single option using x-ng', function() {
-        doc.append(
-          '<select x-ng-model="test">' +
-          '  <option value=A>one</option>' +
-          '  <option value=B selected>two</option>' +
-          '</select>'
-        );
-        $root.dsl.select('test').option('A');
-        expect(doc.find('[x-ng-model="test"]').val()).toEqual('A');
-      });
-
-      it('should select option by exact name', function() {
-        doc.append(
-            '<select ng-model="test">' +
-            '  <option value=A>twenty one</option>' +
-            '  <option value=B selected>two</option>' +
-            '  <option value=C>thirty one</option>' +
-            '  <option value=D>one</option>' +
-            '</select>'
-          );
-        $root.dsl.select('test').option('one');
-        expect(doc.find('[ng-model="test"]').val()).toEqual('D');
-      });
-
-      it('should select option by name if no exact match and name contains value', function() {
-        doc.append(
-            '<select ng-model="test">' +
-            '  <option value=A>twenty one</option>' +
-            '  <option value=B selected>two</option>' +
-            '  <option value=C>thirty one</option>' +
-            '</select>'
-          );
-        $root.dsl.select('test').option('one');
-        expect(doc.find('[ng-model="test"]').val()).toEqual('A');
-      });
-
-      it('should select multiple options', function() {
-        doc.append(
-          '<select ng-model="test" multiple>' +
-          '  <option>A</option>' +
-          '  <option selected>B</option>' +
-          '  <option>C</option>' +
-          '</select>'
-        );
-        $root.dsl.select('test').options('A', 'B');
-        expect(doc.find('[ng-model="test"]').val()).toEqual(['A','B']);
-      });
-
-      it('should fail to select multiple options on non-multiple select', function() {
-        doc.append('<select ng-model="test"></select>');
-        $root.dsl.select('test').options('A', 'B');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-
-      it('should fail to select an option that does not exist', function() {
-        doc.append(
-            '<select ng-model="test">' +
-            '  <option value=A>one</option>' +
-            '  <option value=B selected>two</option>' +
-            '</select>'
-          );
-        $root.dsl.select('test').option('three');
-        expect($root.futureError).toMatch(/not found/);
-      });
-    });
-
-    describe('Element', function() {
-      it('should execute click', function() {
-        var clicked;
-        // Hash is important, otherwise we actually
-        // go to a different page and break the runner
-        doc.append('<a href="#"></a>');
-        doc.find('a').click(function() {
-          clicked = true;
-        });
-        $root.dsl.element('a').click();
-      });
-
-      it('should navigate page if click on anchor', function() {
-        expect($window.location).not.toEqual('#foo');
-        doc.append('<a href="#foo"></a>');
-        $root.dsl.element('a').click();
-        expect($window.location).toMatch(/#foo$/);
-      });
-
-      it('should not navigate if click event was cancelled', function() {
-        var initLocation = $window.location,
-            elm = jqLite('<a href="#foo"></a>');
-
-        doc.append(elm);
-        elm.on('click', function(event) {
-          event.preventDefault();
-        });
-
-        $root.dsl.element('a').click();
-        expect($window.location).toBe(initLocation);
-        dealoc(elm);
-      });
-
-      it('should execute dblclick', function() {
-        var clicked;
-        // Hash is important, otherwise we actually
-        // go to a different page and break the runner
-        doc.append('<a href="#"></a>');
-        doc.find('a').dblclick(function() {
-          clicked = true;
-        });
-        $root.dsl.element('a').dblclick();
-      });
-
-      it('should navigate page if dblclick on anchor', function() {
-        expect($window.location).not.toEqual('#foo');
-        doc.append('<a href="#foo"></a>');
-        $root.dsl.element('a').dblclick();
-        expect($window.location).toMatch(/#foo$/);
-      });
-
-      it('should not navigate if dblclick event was cancelled', function() {
-        var initLocation = $window.location,
-            elm = jqLite('<a href="#foo"></a>');
-
-        doc.append(elm);
-        elm.on('dblclick', function(event) {
-          event.preventDefault();
-        });
-
-        $root.dsl.element('a').dblclick();
-        expect($window.location).toBe(initLocation);
-        dealoc(elm);
-      });
-
-      it('should execute mouseover', function() {
-        var mousedOver;
-        doc.append('<div></div>');
-        doc.find('div').mouseover(function() {
-          mousedOver = true;
-        });
-        $root.dsl.element('div').mouseover();
-        expect(mousedOver).toBe(true);
-      });
-
-      it('should bubble up the mouseover event', function() {
-        var mousedOver;
-        doc.append('<div id="outer"><div id="inner"></div></div>');
-        doc.find('#outer').mouseover(function() {
-          mousedOver = true;
-        });
-        $root.dsl.element('#inner').mouseover();
-        expect(mousedOver).toBe(true);
-      });
-
-      it('should execute mousedown', function() {
-        var mousedDown;
-        doc.append('<div></div>');
-        doc.find('div').mousedown(function() {
-          mousedDown = true;
-        });
-        $root.dsl.element('div').mousedown();
-        expect(mousedDown).toBe(true);
-      });
-
-      it('should bubble up the mousedown event', function() {
-        var mousedDown;
-        doc.append('<div id="outer"><div id="inner"></div></div>');
-        doc.find('#outer').mousedown(function() {
-          mousedDown = true;
-        });
-        $root.dsl.element('#inner').mousedown();
-        expect(mousedDown).toBe(true);
-      });
-
-      it('should execute mouseup', function() {
-        var mousedUp;
-        doc.append('<div></div>');
-        doc.find('div').mouseup(function() {
-          mousedUp = true;
-        });
-        $root.dsl.element('div').mouseup();
-        expect(mousedUp).toBe(true);
-      });
-
-      it('should bubble up the mouseup event', function() {
-        var mousedUp;
-        doc.append('<div id="outer"><div id="inner"></div></div>');
-        doc.find('#outer').mouseup(function() {
-          mousedUp = true;
-        });
-        $root.dsl.element('#inner').mouseup();
-        expect(mousedUp).toBe(true);
-      });
-
-      it('should count matching elements', function() {
-        doc.append('<span></span><span></span>');
-        $root.dsl.element('span').count();
-        expect($root.futureResult).toEqual(2);
-      });
-
-      it('should return count of 0 if no matching elements', function() {
-        $root.dsl.element('span').count();
-        expect($root.futureResult).toEqual(0);
-      });
-
-      it('should get attribute', function() {
-        doc.append('<div id="test" class="foo"></div>');
-        $root.dsl.element('#test').attr('class');
-        expect($root.futureResult).toEqual('foo');
-      });
-
-      it('should set attribute', function() {
-        doc.append('<div id="test" class="foo"></div>');
-        $root.dsl.element('#test').attr('class', 'bam');
-        expect(doc.find('#test').attr('class')).toEqual('bam');
-      });
-
-      it('should get property', function() {
-        doc.append('<div id="test" class="foo"></div>');
-        $root.dsl.element('#test').prop('className');
-        expect($root.futureResult).toEqual('foo');
-      });
-
-      it('should set property', function() {
-        doc.append('<div id="test" class="foo"></div>');
-        $root.dsl.element('#test').prop('className', 'bam');
-        expect(doc.find('#test').prop('className')).toEqual('bam');
-      });
-
-      it('should get css', function() {
-        doc.append('<div id="test" style="height: 30px"></div>');
-        $root.dsl.element('#test').css('height');
-        expect($root.futureResult).toMatch(/30px/);
-      });
-
-      it('should set css', function() {
-        doc.append('<div id="test" style="height: 10px"></div>');
-        $root.dsl.element('#test').css('height', '20px');
-        expect(doc.find('#test').css('height')).toEqual('20px');
-      });
-
-      it('should add all jQuery key/value methods', function() {
-        var METHODS = ['css', 'attr'];
-        var chain = $root.dsl.element('input');
-        angular.forEach(METHODS, function(name) {
-          expect(angular.isFunction(chain[name])).toBeTruthy();
-        });
-      });
-
-      it('should get val', function() {
-        doc.append('<input value="bar">');
-        $root.dsl.element('input').val();
-        expect($root.futureResult).toEqual('bar');
-      });
-
-      it('should set val', function() {
-        doc.append('<input value="bar">');
-        $root.dsl.element('input').val('baz');
-        expect(doc.find('input').val()).toEqual('baz');
-      });
-
-      it('should use correct future name for generated set methods', function() {
-        doc.append('<input value="bar">');
-        $root.dsl.element('input').val(false);
-        expect($root.futures.pop()).toMatch(/element 'input' set val/);
-      });
-
-      it('should use correct future name for generated get methods', function() {
-        doc.append('<input value="bar">');
-        $root.dsl.element('input').val();
-        expect($root.futures.pop()).toMatch(/element 'input' val/);
-      });
-
-      it('should add all jQuery property methods', function() {
-        var METHODS = [
-          'val', 'text', 'html', 'height', 'innerHeight', 'outerHeight', 'width',
-          'innerWidth', 'outerWidth', 'position', 'scrollLeft', 'scrollTop', 'offset'
-        ];
-        var chain = $root.dsl.element('input');
-        angular.forEach(METHODS, function(name) {
-          expect(angular.isFunction(chain[name])).toBeTruthy();
-        });
-      });
-
-      it('should execute custom query', function() {
-        doc.append('<a id="test" href="http://example.com/myUrl"></a>');
-        $root.dsl.element('#test').query(function(elements, done) {
-          done(null, elements.attr('href'));
-        });
-        expect($root.futureResult).toEqual('http://example.com/myUrl');
-      });
-
-      it('should use the selector as label if none is given', function() {
-        $root.dsl.element('mySelector');
-        expect($root.label).toEqual('mySelector');
-      });
-
-      it('should include the selector in paren when a label is given', function() {
-        $root.dsl.element('mySelector', 'myLabel');
-        expect($root.label).toEqual('myLabel ( mySelector )');
-      });
-    });
-
-    describe('Repeater', function() {
-      var chain;
-      beforeEach(inject(function($compile, $rootScope) {
-        element = $compile(
-          '<ul><li ng-repeat="i in items">{{i.name}}  {{i.gender}}</li></ul>')($rootScope);
-        $rootScope.items = [{name:'misko', gender:'male'}, {name:'felisa', gender:'female'}];
-        $rootScope.$apply();
-        doc.append(element);
-        chain = $root.dsl.repeater('ul li');
-      }));
-
-      it('should get the row count', function() {
-        chain.count();
-        expect($root.futureResult).toEqual(2);
-      });
-
-      it('should return 0 if repeater doesnt match', inject(function($rootScope) {
-        $rootScope.items = [];
-        $rootScope.$apply();
-        chain.count();
-        expect($root.futureResult).toEqual(0);
-      }));
-
-      it('should get a row of bindings', function() {
-        chain.row(1);
-        expect($root.futureResult).toEqual(['felisa', 'female']);
-      });
-
-      it('should get a column of bindings', function() {
-        chain.column('i.gender');
-        expect($root.futureResult).toEqual(['male', 'female']);
-      });
-
-      it('should use the selector as label if none is given', function() {
-        expect($root.label).toEqual('ul li');
-      });
-
-      it('should include the selector in paren when a label is given', function() {
-        $root.dsl.repeater('mySelector', 'myLabel');
-        expect($root.label).toEqual('myLabel ( ul li mySelector )');
-      });
-    });
-
-    describe('Binding', function() {
-      var compile;
-
-      beforeEach(inject(function($compile, $rootScope) {
-        compile = function(html, value) {
-          element = $compile(html)($rootScope);
-          doc.append(element);
-          $rootScope.foo = {bar: value || 'some value'};
-          $rootScope.$apply();
-        };
-      }));
-
-
-      it('should select binding in interpolation', function() {
-        compile('<span>{{ foo.bar }}</span>');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureResult).toEqual('some value');
-      });
-
-      it('should select binding in multiple interpolations', function() {
-        compile('<span>{{ foo.bar }}<hr/> {{ true }}</span>');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureResult).toEqual('some value');
-
-        $root.dsl.binding('true');
-        expect($root.futureResult).toEqual('true');
-      });
-
-      it('should select binding by name', function() {
-        compile('<span ng-bind=" foo.bar "></span>');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureResult).toEqual('some value');
-      });
-
-      it('should select binding by regexp', function() {
-        compile('<span ng-bind="foo.bar">some value</span>');
-        $root.dsl.binding(/^foo\..+/);
-        expect($root.futureResult).toEqual('some value');
-      });
-
-      it('should return innerHTML for all the other elements', function() {
-        compile('<div ng-bind-html="foo.bar"></div>', 'some <b>value</b>');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureResult.toLowerCase()).toEqual('some <b>value</b>');
-      });
-
-      it('should select binding in template by name', function() {
-        compile('<pre ng-bind-template="foo {{foo.bar}} baz"></pre>', 'bar');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureResult).toEqual('bar');
-      });
-
-      it('should match bindings by substring match', function() {
-        compile('<pre ng-bind="foo.bar | lowercase"></pre>', 'binding value');
-        $root.dsl.binding('foo . bar');
-        expect($root.futureResult).toEqual('binding value');
-      });
-
-      it('should return error if no bindings in document', function() {
-        $root.dsl.binding('foo.bar');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-
-      it('should return error if no binding matches', function() {
-        compile('<span ng-bind="foo">some value</span>');
-        $root.dsl.binding('foo.bar');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-    });
-
-    describe('Using', function() {
-      it('should prefix selector in $document.elements()', function() {
-        var chain;
-        doc.append(
-          '<div id="test1"><input ng-model="test.input" value="something"></div>' +
-          '<div id="test2"><input ng-model="test.input" value="something"></div>'
-        );
-        chain = $root.dsl.using('div#test2');
-        chain.input('test.input').enter('foo');
-        var inputs = _jQuery('input[ng-model="test.input"]');
-        expect(inputs.first().val()).toEqual('something');
-        expect(inputs.last().val()).toEqual('foo');
-      });
-
-      it('should use the selector as label if none is given', function() {
-        $root.dsl.using('mySelector');
-        expect($root.label).toEqual('mySelector');
-      });
-
-      it('should include the selector in paren when a label is given', function() {
-        $root.dsl.using('mySelector', 'myLabel');
-        expect($root.label).toEqual('myLabel ( mySelector )');
-      });
-
-    });
-
-    describe('Input', function() {
-      it('should change value in text input', function(done) {
-        inject(function($compile) {
-          var job = createAsync(done);
-          job
-          .runs(function() {
-            element = $compile('<input ng-model="test.input" value="something">')($root);
-            doc.append(element);
-            var chain = $root.dsl.input('test.input');
-            chain.enter('foo');
-            expect(_jQuery('input[ng-model="test.input"]').val()).toEqual('foo');
-          })
-          // cleanup the event queue
-          .waits(0)
-          .runs(function() {
-            expect($root.test.input).toBe('foo');
-          })
-          .done();
-          job.start();
-        });
-      });
-
-      it('should change value in text input in dash form', function() {
-        doc.append('<input ng-model="test.input" value="something">');
-        var chain = $root.dsl.input('test.input');
-        chain.enter('foo');
-        expect(_jQuery('input[ng-model="test.input"]').val()).toEqual('foo');
-      });
-      it('should change value in text input in data-ng form', function() {
-        doc.append('<input data-ng-model="test.input" value="something">');
-        var chain = $root.dsl.input('test.input');
-        chain.enter('foo');
-        expect(_jQuery('input[data-ng-model="test.input"]').val()).toEqual('foo');
-      });
-      it('should change value in text input in x-ng form', function() {
-        doc.append('<input x-ng-model="test.input" value="something">');
-        var chain = $root.dsl.input('test.input');
-        chain.enter('foo');
-        expect(_jQuery('input[x-ng-model="test.input"]').val()).toEqual('foo');
-      });
-
-
-
-      it('should return error if no input exists', function() {
-        var chain = $root.dsl.input('test.input');
-        chain.enter('foo');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-
-      it('should toggle checkbox state', function() {
-        doc.append('<input type="checkbox" ng-model="test.input" checked>');
-        expect(_jQuery('input[ng-model="test.input"]').
-          prop('checked')).toBe(true);
-        var chain = $root.dsl.input('test.input');
-        chain.check();
-        expect(_jQuery('input[ng-model="test.input"]').
-          prop('checked')).toBe(false);
-        $window.angular.reset();
-        chain.check();
-        expect(_jQuery('input[ng-model="test.input"]').
-          prop('checked')).toBe(true);
-      });
-
-      it('should return error if checkbox did not match', function() {
-        var chain = $root.dsl.input('test.input');
-        chain.check();
-        expect($root.futureError).toMatch(/did not match/);
-      });
-
-      it('should select option from radio group', function() {
-        doc.append(
-          '<input type="radio" name="r" ng:model="test.input" value="foo">' +
-          '<input type="radio" name="r" ng:model="test.input" value="bar" checked="checked">'
-        );
-        // HACK! We don't know why this is sometimes false on chrome
-        _jQuery('input[ng\\:model="test.input"][value="bar"]').prop('checked', true);
-        expect(_jQuery('input[ng\\:model="test.input"][value="bar"]').
-          prop('checked')).toBe(true);
-        expect(_jQuery('input[ng\\:model="test.input"][value="foo"]').
-          prop('checked')).toBe(false);
-        var chain = $root.dsl.input('test.input');
-        chain.select('foo');
-        expect(_jQuery('input[ng\\:model="test.input"][value="bar"]').
-          prop('checked')).toBe(false);
-        expect(_jQuery('input[ng\\:model="test.input"][value="foo"]').
-          prop('checked')).toBe(true);
-      });
-
-      it('should return error if radio button did not match', function() {
-        var chain = $root.dsl.input('test.input');
-        chain.select('foo');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-
-      describe('val', function() {
-        it('should return value in text input', function() {
-          doc.append('<input ng-model="test.input" value="something">');
-          $root.dsl.input('test.input').val();
-          expect($root.futureResult).toEqual('something');
-        });
-      });
-    });
-
-    describe('Textarea', function() {
-
-      it('should change value in textarea', function() {
-        doc.append('<textarea ng-model="test.textarea">something</textarea>');
-        var chain = $root.dsl.input('test.textarea');
-        chain.enter('foo');
-        expect(_jQuery('textarea[ng-model="test.textarea"]').val()).toEqual('foo');
-      });
-
-      it('should return error if no textarea exists', function() {
-        var chain = $root.dsl.input('test.textarea');
-        chain.enter('foo');
-        expect($root.futureError).toMatch(/did not match/);
-      });
-    });
-  });
-});
diff --git a/test/ngScenario/e2e/.eslintrc.json b/test/ngScenario/e2e/.eslintrc.json
deleted file mode 100644
index 8df3459845a9..000000000000
--- a/test/ngScenario/e2e/.eslintrc.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "root": true,
-  "extends": "../../../.eslintrc-node.json",
-
-  "env": {
-    "jasmine": true,
-    "protractor": true
-  }
-}
diff --git a/test/ngScenario/e2e/Runner-compiled.html b/test/ngScenario/e2e/Runner-compiled.html
deleted file mode 100644
index 530fef96233a..000000000000
--- a/test/ngScenario/e2e/Runner-compiled.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <script type="text/javascript" src="../../../build/angular-scenario.js" ng-autotest></script>
-    <script type="text/javascript" src="widgets-scenario.js"></script>
-  </head>
-  <body>
-  </body>
-</html>
diff --git a/test/ngScenario/e2e/Runner.html b/test/ngScenario/e2e/Runner.html
deleted file mode 100644
index f5d03ca5e4bc..000000000000
--- a/test/ngScenario/e2e/Runner.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-  <meta http-equiv="expires" content="0">
-    <script type="text/javascript" src="../../../src/scenario/angular-bootstrap.js" ng-autotest></script>
-    <script type="text/javascript" src="widgets-scenario.js"></script>
-  </head>
-  <body>
-  </body>
-</html>
diff --git a/test/ngScenario/e2e/style.css b/test/ngScenario/e2e/style.css
deleted file mode 100644
index 26540becebb7..000000000000
--- a/test/ngScenario/e2e/style.css
+++ /dev/null
@@ -1,11 +0,0 @@
-th {
-  text-align: left;
-}
-
-tr {
-  border: 1px solid black;
-}
-
-.redbox {
-  background-color: red;
-}
diff --git a/test/ngScenario/e2e/widgets-scenario.js b/test/ngScenario/e2e/widgets-scenario.js
deleted file mode 100644
index 40b176d1b30a..000000000000
--- a/test/ngScenario/e2e/widgets-scenario.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/* global using: false, binding: false, input: false, select: false, repeater: false */
-'use strict';
-
-describe('widgets', function() {
-  it('should verify that basic widgets work', function() {
-    browser().navigateTo('widgets.html');
-
-    using('#text-basic-box').input('text.basic').enter('Carlos');
-    expect(binding('text.basic')).toEqual('Carlos');
-    input('text.basic').enter('Carlos Santana');
-    expect(binding('text.basic')).not().toEqual('Carlos Boozer');
-
-    input('text.password').enter('secret');
-    expect(binding('text.password')).toEqual('secret');
-
-    expect(binding('text.hidden')).toEqual('hiddenValue');
-
-    expect(binding('gender')).toEqual('male');
-    input('gender').select('female');
-    expect(using('#gender-box').binding('gender')).toEqual('female');
-
-    expect(repeater('#repeater-row ul li').count()).toEqual(2);
-    expect(repeater('#repeater-row ul li').row(1)).toEqual(['adam']);
-    expect(repeater('#repeater-row ul li').column('name')).toEqual(['misko', 'adam']);
-
-    select('select').option('B');
-    expect(binding('select')).toEqual('B');
-
-    select('multiselect').options('A', 'C');
-    expect(binding('multiselect').fromJson()).toEqual(['A', 'C']);
-
-    expect(binding('button').fromJson()).toEqual({'count': 0});
-    expect(binding('form').fromJson()).toEqual({'count': 0});
-
-    element('form a', '\'action\' link').click();
-    expect(binding('button').fromJson()).toEqual({'count': 1});
-
-    element('input[value="submit input"]', '\'submit input\' button').click();
-    expect(binding('button').fromJson()).toEqual({'count': 2});
-    expect(binding('form').fromJson()).toEqual({'count': 1});
-
-    element('button:contains("submit button")', '\'submit button\' button').click();
-    expect(binding('button').fromJson()).toEqual({'count': 2});
-    expect(binding('form').fromJson()).toEqual({'count': 2});
-
-    element('input[value="button"]', '\'button\' button').click();
-    expect(binding('button').fromJson()).toEqual({'count': 3});
-
-    element('input[type="image"]', 'form image').click();
-    expect(binding('button').fromJson()).toEqual({'count': 4});
-
-    /**
-     * Custom value parser for futures.
-     */
-    function checkboxParser(value) {
-      // eslint-disable-next-line no-undef
-      return angular.fromJson(value.substring(value.indexOf('=') + 1));
-    }
-
-    input('checkbox.tea').check();
-    expect(binding('checkbox').parsedWith(checkboxParser)).toEqual({coffee: false, tea: false});
-    input('checkbox.coffee').check();
-    expect(binding('checkbox').parsedWith(checkboxParser)).toEqual({coffee: true, tea: false});
-    input('checkbox.tea').check();
-    input('checkbox.tea').check();
-    input('checkbox.tea').check();
-    expect(binding('checkbox').parsedWith(checkboxParser)).toEqual({coffee: true, tea: true});
-  });
-});
diff --git a/test/ngScenario/e2e/widgets.html b/test/ngScenario/e2e/widgets.html
deleted file mode 100644
index 5fdae881cf68..000000000000
--- a/test/ngScenario/e2e/widgets.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:ng="http://angularjs.org" ng-app>
-  <head>
-    <link rel="stylesheet" type="text/css" href="style.css"/>
-    <script type="text/javascript" src="../../../src/angular-bootstrap.js"></script>
-  </head>
-  <body ng-init="$window.$scope = this">
-    <table>
-      <tr>
-        <th width="330">Description</th>
-        <th>Test</th>
-        <th>Result</th>
-      </tr>
-      <tr><th colspan="3">Input text field</th></tr>
-      <tr>
-        <td>basic</td>
-        <td id="text-basic-box">
-          <input type="text" ng-model="text.basic"/>
-        </td>
-        <td>text.basic={{text.basic}}</td>
-      </tr>
-      <tr>
-        <td>password</td>
-        <td><input type="password" ng-model="text.password" /></td>
-        <td>text.password={{text.password}}</td>
-      </tr>
-      <tr>
-        <td>hidden</td>
-        <td><input type="hidden" ng-model="text.hidden" ng-init="text.hidden='hiddenValue'" /></td>
-        <td>text.hidden={{text.hidden}}</td>
-      </tr>
-      <tr><th colspan="3">Input selection field</th></tr>
-      <tr id="gender-box" ng-init="gender='male'">
-        <td>radio</td>
-        <td>
-         <input type="radio" ng-model="gender" value="female"/> Female <br/>
-         <input type="radio" ng-model="gender" value="male"/> Male
-        </td>
-        <td>gender={{gender}}</td>
-      </tr>
-      <tr>
-        <td>checkbox</td>
-        <td ng-init="checkbox={'tea': true, 'coffee': false}">
-         <input type="checkbox" ng-model="checkbox.tea" value="on"/> Tea<br/>
-         <input type="checkbox" ng-model="checkbox.coffee" value="on"/> Coffee
-        </td>
-        <td>
-          <pre>checkbox={{checkbox}}</pre>
-        </td>
-      </tr>
-      <tr>
-        <td>select</td>
-        <td>
-          <select ng-model="select">
-            <option>A</option>
-            <option>B</option>
-            <option>C</option>
-          </select>
-        </td>
-        <td>select={{select}}</td>
-      </tr>
-      <tr>
-        <td>multiselect</td>
-        <td>
-          <select ng-model="multiselect" multiple>
-            <option>A</option>
-            <option>B</option>
-            <option>C</option>
-          </select>
-        </td>
-        <td>multiselect={{multiselect}}</td>
-      </tr>
-      <tr><th colspan="3">Buttons</th></tr>
-      <tr>
-        <td>ng-change<br/>ng-click</td>
-        <td ng-init="button.count = 0; form.count = 0;">
-          <form ng-submit="form.count = form.count + 1">
-           <input type="button" value="button" ng-click="button.count = button.count + 1"/> <br/>
-           <input type="submit" value="submit input" ng-click="button.count = button.count + 1"/><br/>
-           <button type="submit">submit button</button>
-           <input type="image" src="" ng-click="button.count = button.count + 1"/><br/>
-           <a href="" ng-click="button.count = button.count + 1">action</a>
-          </form>
-        </td>
-        <td>button={{button}} form={{form}}</td>
-      </tr>
-      <tr><th colspan="3">Repeaters</th></tr>
-      <tr id="repeater-row">
-        <td>ng-repeat</td>
-        <td>
-          <ul>
-            <li ng-repeat="name in ['misko', 'adam']">{{name}}</li>
-          </ul>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </body>
- </html>
diff --git a/test/ngScenario/matchersSpec.js b/test/ngScenario/matchersSpec.js
deleted file mode 100644
index 7b68d2b9b731..000000000000
--- a/test/ngScenario/matchersSpec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-
-describe('angular.scenario.matchers', function() {
-  var matchers;
-
-  function expectMatcher(value, test) {
-    delete matchers.error;
-    delete matchers.future.value;
-    if (isDefined(value)) {
-      matchers.future.value = value;
-    }
-    test();
-    expect(matchers.error).toBeUndefined();
-  }
-
-  beforeEach(function() {
-    /**
-     * Mock up the future system wrapped around matchers.
-     *
-     * @see Scenario.js#angular.scenario.matcher
-     */
-    matchers = {
-      future: { name: 'test' }
-    };
-    matchers.addFuture = function(name, callback) {
-      callback(function(error) {
-        matchers.error = error;
-      });
-    };
-    angular.extend(matchers, angular.scenario.matcher);
-  });
-
-  it('should handle basic matching', function() {
-    expectMatcher(10, function() { matchers.toEqual(10); });
-    expectMatcher('value', function() { matchers.toBeDefined(); });
-    expectMatcher([1], function() { matchers.toBeTruthy(); });
-    expectMatcher('', function() { matchers.toBeFalsy(); });
-    expectMatcher(0, function() { matchers.toBeFalsy(); });
-    expectMatcher('foo', function() { matchers.toMatch('.o.'); });
-    expectMatcher(null, function() { matchers.toBeNull(); });
-    expectMatcher([1, 2, 3], function() { matchers.toContain(2); });
-    expectMatcher(3, function() { matchers.toBeLessThan(10); });
-    expectMatcher(3, function() { matchers.toBeGreaterThan(-5); });
-  });
-
-  it('should have toHaveClass matcher', function() {
-    var e = angular.element('<div class="abc">');
-    expect(e).not.toHaveClass('none');
-    expect(e).toHaveClass('abc');
-  });
-});
diff --git a/test/ngScenario/mocks.js b/test/ngScenario/mocks.js
deleted file mode 100644
index 849d78d9bba9..000000000000
--- a/test/ngScenario/mocks.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-
-angular.scenario.testing = angular.scenario.testing || {};
-
-angular.scenario.testing.MockAngular = function() {
-  this.reset();
-  this.element = jqLite;
-};
-
-angular.scenario.testing.MockAngular.prototype.reset = function() {
-  this.log = [];
-};
-
-angular.scenario.testing.MockAngular.prototype.poll = function() {
-  this.log.push('$browser.poll()');
-  return this;
-};
-
-angular.scenario.testing.MockRunner = function() {
-  this.listeners = [];
-};
-
-angular.scenario.testing.MockRunner.prototype.on = function(eventName, fn) {
-  this.listeners[eventName] = this.listeners[eventName] || [];
-  this.listeners[eventName].push(fn);
-};
-
-angular.scenario.testing.MockRunner.prototype.emit = function(eventName) {
-  var args = Array.prototype.slice.call(arguments, 1);
-  angular.forEach(this.listeners[eventName] || [], function(fn) {
-    fn.apply(this, args);
-  });
-};
diff --git a/test/ngScenario/output/HtmlSpec.js b/test/ngScenario/output/HtmlSpec.js
deleted file mode 100644
index 541d4d4afadf..000000000000
--- a/test/ngScenario/output/HtmlSpec.js
+++ /dev/null
@@ -1,127 +0,0 @@
-'use strict';
-
-describe('angular.scenario.output.html', function() {
-  var runner, model, spec, step, listeners, ui, context;
-
-  beforeEach(function() {
-    listeners = [];
-    spec = {
-      name: 'test spec',
-      definition: {
-        id: 10,
-        name: 'child',
-        children: [],
-        parent: {
-          id: 20,
-          name: 'parent',
-          children: []
-        }
-      }
-    };
-    step = {
-      name: 'some step',
-      line: function() { return 'unknown:-1'; }
-    };
-    runner = new angular.scenario.testing.MockRunner();
-    model = new angular.scenario.ObjectModel(runner);
-    context = _jQuery('<div></div>');
-    ui = angular.scenario.output.html(context, runner, model);
-  });
-
-  it('should create nested describe context', function() {
-    runner.emit('SpecBegin', spec);
-    expect(context.find('#describe-20 #describe-10 > h2').text()).
-      toEqual('describe: child');
-    expect(context.find('#describe-20 > h2').text()).toEqual('describe: parent');
-    expect(context.find('#describe-10 .tests > li .test-info .test-name').text()).
-      toEqual('test spec');
-    expect(context.find('#describe-10 .tests > li').hasClass('status-pending')).
-      toBeTruthy();
-  });
-
-  it('should add link on InteractivePause', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('InteractivePause', spec, step);
-    expect(context.find('.test-actions .test-title:first').text()).toEqual('some step');
-    expect(lowercase(context.find('.test-actions .test-title:last').html())).toEqual(
-      'paused... <a href="javascript:resume()">resume</a> when ready.'
-    );
-  });
-
-  it('should update totals when steps complete', function() {
-    // Failure
-    for (var i = 0; i < 3; ++i) {
-      runner.emit('SpecBegin', spec);
-      runner.emit('StepBegin', spec, step);
-      runner.emit('StepFailure', spec, step, 'error');
-      runner.emit('StepEnd', spec, step);
-      runner.emit('SpecEnd', spec);
-    }
-
-    // Error
-    runner.emit('SpecBegin', spec);
-    runner.emit('SpecError', spec, 'error');
-    runner.emit('SpecEnd', spec);
-
-    // Error
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepError', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    // Success
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    expect(parseInt(context.find('#status-legend .status-failure').text(), 10)).
-      toEqual(3);
-    expect(parseInt(context.find('#status-legend .status-error').text(), 10)).
-      toEqual(2);
-    expect(parseInt(context.find('#status-legend .status-success').text(), 10)).
-      toEqual(1);
-  });
-
-  it('should update timer when test completes', function() {
-    // Success
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    // Failure
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepFailure', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    // Error
-    runner.emit('SpecBegin', spec);
-    runner.emit('SpecError', spec, 'error');
-    runner.emit('SpecEnd', spec);
-
-    context.find('#describe-10 .tests > li .test-info .timer-result').
-      each(function(index, timer) {
-        expect(timer.innerHTML).toMatch(/ms$/);
-      }
-    );
-  });
-
-  it('should include line if provided', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepFailure', spec, step, 'error');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-
-    var errorHtml = context.find('#describe-10 .tests li pre').html();
-    expect(errorHtml.indexOf('unknown:-1')).toEqual(0);
-  });
-
-});
diff --git a/test/ngScenario/output/jsonSpec.js b/test/ngScenario/output/jsonSpec.js
deleted file mode 100644
index 06caf91cae99..000000000000
--- a/test/ngScenario/output/jsonSpec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-describe('angular.scenario.output.json', function() {
-  var output, context;
-  var runner, model, $window;
-  var spec, step;
-
-  beforeEach(function() {
-    $window = {};
-    context = _jQuery('<div></div>');
-    runner = new angular.scenario.testing.MockRunner();
-    model = new angular.scenario.ObjectModel(runner);
-    output = angular.scenario.output.json(context, runner, model);
-    spec = {
-      name: 'test spec',
-      definition: {
-        id: 10,
-        name: 'describe'
-      }
-    };
-    step = {
-      name: 'some step',
-      line: function() { return 'unknown:-1'; }
-    };
-  });
-
-  it('should put json in context on RunnerEnd', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-    runner.emit('RunnerEnd');
-
-    expect(angular.fromJson(context.html()).children['describe']
-      .specs['test spec'].status).toEqual('success');
-  });
-});
diff --git a/test/ngScenario/output/objectSpec.js b/test/ngScenario/output/objectSpec.js
deleted file mode 100644
index d92c939d4be2..000000000000
--- a/test/ngScenario/output/objectSpec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-describe('angular.scenario.output.object', function() {
-  var output;
-  var runner, model, $window;
-  var spec, step;
-
-  beforeEach(function() {
-    $window = {};
-    runner = new angular.scenario.testing.MockRunner();
-    model = new angular.scenario.ObjectModel(runner);
-    runner.$window = $window;
-    output = angular.scenario.output.object(null, runner, model);
-    spec = {
-      name: 'test spec',
-      definition: {
-        id: 10,
-        name: 'describe',
-        children: []
-      }
-    };
-    step = {
-      name: 'some step',
-      line: function() { return 'unknown:-1'; }
-    };
-  });
-
-  it('should create a global variable $result', function() {
-    expect($window.$result).toBeDefined();
-  });
-
-  it('should maintain live state in $result', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-
-    expect($window.$result.children['describe']
-      .specs['test spec'].steps[0].duration).toBeDefined();
-  });
-});
diff --git a/test/ngScenario/output/xmlSpec.js b/test/ngScenario/output/xmlSpec.js
deleted file mode 100644
index 32646417cb1d..000000000000
--- a/test/ngScenario/output/xmlSpec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-'use strict';
-
-describe('angular.scenario.output.xml', function() {
-  var output, context;
-  var runner, model, $window;
-  var spec, step;
-
-  beforeEach(function() {
-    $window = {};
-    context = _jQuery('<div></div>');
-    runner = new angular.scenario.testing.MockRunner();
-    model = new angular.scenario.ObjectModel(runner);
-    output = angular.scenario.output.xml(context, runner, model);
-    spec = {
-      name: 'test spec',
-      definition: {
-        id: 10,
-        name: 'describe'
-      }
-    };
-    step = {
-      name: 'some step',
-      line: function() { return 'unknown:-1'; }
-    };
-  });
-
-  it('should create XML nodes for object model', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-    runner.emit('RunnerEnd');
-    expect(context.find('it').attr('status')).toEqual('success');
-    expect(context.find('it step').attr('status')).toEqual('success');
-  });
-
-  it('should output errors to the XML', function() {
-    runner.emit('SpecBegin', spec);
-    runner.emit('StepBegin', spec, step);
-    runner.emit('StepFailure', spec, step, 'error reason');
-    runner.emit('StepEnd', spec, step);
-    runner.emit('SpecEnd', spec);
-    runner.emit('RunnerEnd');
-
-    expect(context.find('it').attr('status')).toEqual('failure');
-    expect(context.find('it step').attr('status')).toEqual('failure');
-    expect(context.find('it step').text()).toEqual('error reason');
-  });
-});
diff --git a/yarn.lock b/yarn.lock
index 551d4e915d41..3685e09df137 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3644,10 +3644,6 @@ karma-junit-reporter@^1.2.0:
     path-is-absolute "^1.0.0"
     xmlbuilder "8.2.2"
 
-karma-ng-scenario@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/karma-ng-scenario/-/karma-ng-scenario-1.0.0.tgz#03315b27ee866f40443cf88bfebf7963f86543e1"
-
 karma-sauce-launcher@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"

From be1868d66d288de5d5d39c2daed214a56383a6f9 Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@gmail.com>
Date: Fri, 3 Nov 2017 17:57:41 +0100
Subject: [PATCH 2/3] docs(*): add browserTrigger docs; remove references to
 scenario runner

---
 docs/content/guide/e2e-testing.ngdoc |  6 ----
 src/ng/browser.js                    |  1 -
 src/ngMock/browserTrigger.js         | 53 +++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/docs/content/guide/e2e-testing.ngdoc b/docs/content/guide/e2e-testing.ngdoc
index 4593d10716d3..9d1fa32fcee6 100644
--- a/docs/content/guide/e2e-testing.ngdoc
+++ b/docs/content/guide/e2e-testing.ngdoc
@@ -5,12 +5,6 @@
 
 # E2E Testing
 
-<div class="alert alert-danger">
-**Note:** In the past, end-to-end testing could be done with a deprecated tool called
-[AngularJS Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
-is now in maintenance mode.
-</div>
-
 As applications grow in size and complexity, it becomes unrealistic to rely on manual testing to
 verify the correctness of new features, catch bugs and notice regressions. Unit tests
 are the first line of defense for catching bugs, but sometimes issues come up with integration
diff --git a/src/ng/browser.js b/src/ng/browser.js
index 3f5f125ed4c3..d5fbc9b6054a 100644
--- a/src/ng/browser.js
+++ b/src/ng/browser.js
@@ -67,7 +67,6 @@ function Browser(window, document, $log, $sniffer) {
 
   /**
    * @private
-   * Note: this method is used only by scenario runner
    * TODO(vojta): prefix this method with $$ ?
    * @param {function()} callback Function that will be called when no outstanding request
    */
diff --git a/src/ngMock/browserTrigger.js b/src/ngMock/browserTrigger.js
index 13b2592fea03..07dbbc677e20 100644
--- a/src/ngMock/browserTrigger.js
+++ b/src/ngMock/browserTrigger.js
@@ -2,13 +2,56 @@
 
 (function() {
   /**
-   * Triggers a browser event. Attempts to choose the right event if one is
-   * not specified.
+   * @ngdoc function
+   * @name browserTrigger
+   * @description
+   *
+   * This is a global (window) function that is only available when the {@link ngMock} module is
+   * included.
+   *
+   * It can be used to trigger a native browser event on an element, which is useful for unit testing.
+   *
    *
    * @param {Object} element Either a wrapped jQuery/jqLite node or a DOMElement
-   * @param {string} eventType Optional event type
-   * @param {Object=} eventData An optional object which contains additional event data (such as x,y
-   * coordinates, keys, etc...) that are passed into the event when triggered
+   * @param {string=} eventType Optional event type. If none is specified, the function tries
+   *                            to determine the right event type for the element, e.g. `change` for
+   *                            `input[text]`.
+   * @param {Object=} eventData An optional object which contains additional event data that is used
+   *                            when creating the event:
+   *
+   *  - `bubbles`: [Event.bubbles](https://developer.mozilla.org/docs/Web/API/Event/bubbles).
+   *    Not applicable to all events.
+   *
+   *  - `cancelable`: [Event.cancelable](https://developer.mozilla.org/docs/Web/API/Event/cancelable).
+   *    Not applicable to all events.
+   *
+   *  - `charcode`: [charCode](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/charcode)
+   *    for keyboard events (keydown, keypress, and keyup).
+   *
+   *  - `elapsedTime`: the elapsedTime for
+   *    [TransitionEvent](https://developer.mozilla.org/docs/Web/API/TransitionEvent)
+   *    and [AnimationEvent](https://developer.mozilla.org/docs/Web/API/AnimationEvent).
+   *
+   *  - `keycode`: [keyCode](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/keycode)
+   *    for keyboard events (keydown, keypress, and keyup).
+   *
+   *  - `keys`: an array of possible modifier keys (ctrl, alt, shift, meta) for
+   *    [MouseEvent](https://developer.mozilla.org/docs/Web/API/MouseEvent) and
+   *    keyboard events (keydown, keypress, and keyup).
+   *
+   *  - `relatedTarget`: the
+   *    [relatedTarget](https://developer.mozilla.org/docs/Web/API/MouseEvent/relatedTarget)
+   *    for [MouseEvent](https://developer.mozilla.org/docs/Web/API/MouseEvent).
+   *
+   *  - `which`: [which](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/which)
+   *    for keyboard events (keydown, keypress, and keyup).
+   *
+   *  - `x`: x-coordinates for [MouseEvent](https://developer.mozilla.org/docs/Web/API/MouseEvent)
+   *    and [TouchEvent](https://developer.mozilla.org/docs/Web/API/TouchEvent).
+   *
+   *  - `y`: y-coordinates for [MouseEvent](https://developer.mozilla.org/docs/Web/API/MouseEvent)
+   *    and [TouchEvent](https://developer.mozilla.org/docs/Web/API/TouchEvent).
+   *
    */
   window.browserTrigger = function browserTrigger(element, eventType, eventData) {
     if (element && !element.nodeName) element = element[0];

From 23087b5df71798085ce8e788b7fed55445968503 Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@gmail.com>
Date: Fri, 3 Nov 2017 17:58:36 +0100
Subject: [PATCH 3/3] refactor($location): remove obsolete workaround for
 Firefox bug

The bug was fixed in Firefox 48: https://bugzilla.mozilla.org/show_bug.cgi?id=684208,
and only affected the scenario runner
---
 src/ng/location.js           |  2 --
 src/ngMock/browserTrigger.js | 21 +--------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/ng/location.js b/src/ng/location.js
index 625b9297720d..369b45d3fff2 100644
--- a/src/ng/location.js
+++ b/src/ng/location.js
@@ -938,8 +938,6 @@ function $LocationProvider() {
           // update location manually
           if ($location.absUrl() !== $browser.url()) {
             $rootScope.$apply();
-            // hack to work around FF6 bug 684208 when scenario runner clicks on links
-            $window.angular['ff-684208-preventDefault'] = true;
           }
         }
       }
diff --git a/src/ngMock/browserTrigger.js b/src/ngMock/browserTrigger.js
index 07dbbc677e20..196772d1e3e9 100644
--- a/src/ngMock/browserTrigger.js
+++ b/src/ngMock/browserTrigger.js
@@ -147,30 +147,11 @@
 
     if (!evnt) return;
 
-    var originalPreventDefault = evnt.preventDefault,
-        appWindow = element.ownerDocument.defaultView,
-        fakeProcessDefault = true,
-        finalProcessDefault,
-        angular = appWindow.angular || {};
-
-    // igor: temporary fix for https://bugzilla.mozilla.org/show_bug.cgi?id=684208
-    angular['ff-684208-preventDefault'] = false;
-    evnt.preventDefault = function() {
-      fakeProcessDefault = false;
-      return originalPreventDefault.apply(evnt, arguments);
-    };
-
     if (!eventData.bubbles || supportsEventBubblingInDetachedTree() || isAttachedToDocument(element)) {
-      element.dispatchEvent(evnt);
+      return element.dispatchEvent(evnt);
     } else {
       triggerForPath(element, evnt);
     }
-
-    finalProcessDefault = !(angular['ff-684208-preventDefault'] || !fakeProcessDefault);
-
-    delete angular['ff-684208-preventDefault'];
-
-    return finalProcessDefault;
   };
 
   function supportsTouchEvents() {