Upgrade all things Ember to 2.11 (#922)

* Upgrade cache paths/phantomjs dependency as suggested

* Remove unneeded bower dependencies

* Modify node dependencies

The ember version is now installed via the ember-source package

* Extract includePolyfill to `ember-cli-babel`

* Replace andSelf() with addBack()

This was deprecated in jQuery 1.8 (https://api.jquery.com/category/deprecated/deprecated-1.8/)

* Restore ember-cli-shims

This was actually the key to getting the app to boot. This was converted from a bower dependency to a npm dependency (like ember itself)

* This should not be necessary, but the tests pass so...

.travis.yml

@@ -26,11 +26,11 @@ cache:
     - bower_components
 
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 

app/components/popup-click-handler.js

@@ -7,7 +7,7 @@ export default Ember.Component.extend({
   classNames: ['application'],
 
   click(event) {
-    let targetAndParents = Ember.$(event.target).parents().andSelf();
+    let targetAndParents = Ember.$(event.target).parents().addBack();
 
     if (!(targetAndParents.hasClass('open-popup') || targetAndParents.hasClass('popup'))) {
       this.get('popup').close();

bower.json

@@ -1,22 +1,10 @@
 {
   "name": "travis",
   "dependencies": {
-    "ember": "2.10.2",
-    "ember-cli-shims": "0.1.3",
-    "ember-load-initializers": "0.5.1",
-    "ember-qunit": "0.4.20",
-    "ember-qunit-notifications": "0.1.0",
-    "jquery": "~2.2",
-    "qunit": "~1.23.1",
     "JavaScript-MD5": "~2.3.0",
     "moment": "~2.13.0",
     "jquery-timeago": "~1.5.2",
     "pusher": "~2.2.3",
-    "ember-resolver": "~0.1.20",
-    "pretender": "~1.1.0",
-    "lodash": "~4.11.2",
-    "Faker": "~3.1.0",
-    "ceibo": "2.0.0",
     "raven-js": "3.10.0",
     "mousetrap": "~1.5.2",
     "prism": "^1.5.1",

ember-cli-build.js

@@ -30,8 +30,10 @@ module.exports = function () {
   }
 
   var app = new EmberApp({
-    babel: {
+    'ember-cli-babel': {
       includePolyfill: true,
+    },
+    babel: {
       optional: ['es7.decorators']
     },
     fingerprint: fingerprint,

package.json

@@ -16,7 +16,7 @@
   "engines": {
     "node": "6.9.4"
   },
-  "author": "",
+  "author": "Travis CI Web Team and Contributors",
   "license": "MIT",
   "devDependencies": {
     "active-model-adapter": "2.1.1",
@@ -27,7 +27,7 @@
     "broccoli-merge-trees": "^1.1.5",
     "ember-ajax": "^2.4.1",
     "ember-browserify": "^1.1.13",
-    "ember-cli": "2.10.0",
+    "ember-cli": "^2.11.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-autoprefixer": "^0.6.0",
     "ember-cli-babel": "^5.1.7",
@@ -38,7 +38,7 @@
     "ember-cli-deprecation-workflow": "0.2.3",
     "ember-cli-document-title": "0.3.3",
     "ember-cli-eslint": "3.0.2",
-    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.3",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-inline-images": "^0.0.4",
@@ -48,12 +48,13 @@
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-sass": "6.1.1",
     "ember-cli-sentry": "2.4.2",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-computed-decorators": "0.3.0",
     "ember-concurrency": "0.7.19",
-    "ember-data": "2.10.0",
+    "ember-data": "2.11.0",
     "ember-data-filter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
@@ -63,6 +64,7 @@
     "ember-load-initializers": "^0.6.3",
     "ember-percy": "^1.2.5",
     "ember-prism": "0.0.8",
+    "ember-source": "^2.11.0",
     "ember-qunit-nice-errors": "1.1.1",
     "ember-resolver": "^2.0.3",
     "emberx-select": "~3.0.0",

tests/acceptance/repo/branches-test.js

@@ -129,7 +129,9 @@ test('view branches', function (assert) {
   andThen(() => {
     assert.equal(document.title, 'killjoys/living-a-feminist-life - Travis CI');
     assert.ok(branchesPage.branchesTabActive, 'Branches tab is active when visiting /org/repo/branches');
+  });
 
+  andThen(() => {
     assert.equal(branchesPage.defaultBranch.name, 'primary');
     assert.ok(branchesPage.defaultBranch.passed, 'expected default branch last build to have passed');
     assert.equal(branchesPage.defaultBranch.buildCount, '3 builds');