Upgrade ember-cli to 2.15

Author: Gaurav0

app/index.html

@@ -10,9 +10,9 @@
     {{content-for 'head'}}
 
     <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <link rel="stylesheet" href="{{rootURL}}loader.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/ember-twiddle.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}loader.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-twiddle.css">
     <link href='//fonts.googleapis.com/css?family=Maven+Pro:400,500,700' rel='stylesheet' type='text/css'>
 
     {{content-for 'head-footer'}}

package.json

@@ -29,7 +29,7 @@
     "ember-ajax": "^3.0.0",
     "ember-api-actions": "~0.1.8",
     "ember-autoresize": "~0.6.1",
-    "ember-cli": "2.14.2",
+    "ember-cli": "2.15.1",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-babel": "^6.12.0",
     "ember-cli-bootstrap-sassy": "~0.5.8",
@@ -44,7 +44,7 @@
     "ember-cli-fastboot": "^1.0.0",
     "ember-cli-file-creator": "~0.4.0",
     "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "~0.4.4",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.7.0",
     "ember-cli-jstree": "^1.0.9",
     "ember-cli-legacy-blueprints": "~0.2.1",
@@ -72,7 +72,7 @@
     "ember-resolver": "^4.0.0",
     "ember-responsive": "^2.0.8",
     "ember-route-action-helper": "^2.0.6",
-    "ember-source": "~2.14.1",
+    "ember-source": "~2.15.0",
     "ember-test-helpers": "~0.6.3",
     "eslint-plugin-ember": "^5.1.0",
     "ivy-codemirror": "^2.1.0",

tests/acceptance/columns-test.js

@@ -93,5 +93,5 @@ test('you can add and remove columns', function(assert) {
 });
 
 function urlHas(text) {
-  return decodeURIComponent(window.location.search).indexOf(text) > 0;
+  return decodeURIComponent(currentURL()).indexOf(text) > 0;
 }

tests/acceptance/fork-test.js

@@ -45,7 +45,7 @@ test('can fork a gist', function(assert) {
   andThen(function() {
     assert.equal(find('.test-unsaved-indicator').length, 0, "No unsaved indicator shown");
 
-    let url = window.location.href;
+    let url = currentURL();
     let route = url.substr(url.lastIndexOf('/'));
     assert.equal(route, '/bd9d8d69-a674-4e0f-867c-c8796ed151a0');
   });

tests/acceptance/gist-test.js

@@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan
 import { findMapText } from 'ember-twiddle/tests/helpers/util';
 import ErrorMessages from 'ember-twiddle/utils/error-messages';
 import { stubValidSession } from 'ember-twiddle/tests/helpers/torii';
-
+import { timeout } from 'ember-concurrency';
 
 const firstColumn = '.code:eq(0)';
 const firstFilePicker = firstColumn + ' .dropdown-toggle';
@@ -322,6 +322,10 @@ test('unsaved indicator', function(assert) {
   fillIn(firstColumnTextarea, "\"some text\";");
   triggerEvent(firstColumnTextarea, "blur");
 
+  andThen(function() {
+    return timeout(10);
+  });
+
   andThen(function() {
     assert.equal(find(indicator).length, 1, "Unsaved indicator reappears after editing");
   });

tests/acceptance/routing-test.js

@@ -88,7 +88,7 @@ test('Able to do routing in a gist', function(assert) {
 
   andThen(() => {
     assert.equal(find(addressBar).val(), '/', "Correct URL is shown in address bar 0");
-    assert.ok(decodeURIComponent(window.location.search).indexOf("route=") === -1, "URL is not added to route query string parameter 0");
+    assert.ok(decodeURIComponent(currentURL()).indexOf("route=") === -1, "URL is not added to route query string parameter 0");
 
     this.registerWaiter();
     iframe_window = outputPane();
@@ -98,7 +98,7 @@ test('Able to do routing in a gist', function(assert) {
   andThen(() => {
     assert.equal(outputContents(outletText), 'About Page', 'About Link leads to About Page being displayed');
     assert.equal(find(addressBar).val(), '/about', "Correct URL is shown in address bar 1");
-    assert.ok(decodeURIComponent(window.location.search).indexOf("route=/about") > 0, "URL is added to route query string parameter 1");
+    assert.ok(decodeURIComponent(currentURL()).indexOf("route=/about") > 0, "URL is added to route query string parameter 1");
 
     this.registerWaiter();
     iframe_window.click(iframe_window.find(indexLink));
@@ -107,7 +107,7 @@ test('Able to do routing in a gist', function(assert) {
   andThen(() => {
     assert.equal(outputContents(outletText), 'Main Page', 'Index Link leads to Main Page being displayed');
     assert.equal(find(addressBar).val(), '/', "Correct URL is shown in address bar 2");
-    assert.ok(decodeURIComponent(window.location.search).indexOf("route=") === -1, "URL is not added to route query string parameter 2");
+    assert.ok(decodeURIComponent(currentURL()).indexOf("route=") === -1, "URL is not added to route query string parameter 2");
   });
 });
 

tests/helpers/wait-for-loaded-iframe.js

@@ -38,7 +38,7 @@ export default function(app, url) {
 
   let times = 0;
 
-  return andThen(function tryVisit() {
+  andThen(function tryVisit() {
     url = url || "/";
 
     if (times++ >= 10) {
@@ -49,4 +49,10 @@ export default function(app, url) {
       run.later(tryVisit, 10)
     }
   });
+
+  return andThen(function() {
+    return new RSVP.Promise(function (resolve) {
+      run.later(resolve, 10);
+    });
+  });
 }

tests/helpers/wait-for-unloaded-iframe.js

@@ -1,7 +1,8 @@
 import Ember from 'ember';
 import wait from 'ember-test-helpers/wait';
+import RSVP from 'rsvp';
 
-const { Test } = Ember;
+const { Test, run } = Ember;
 
 function hasNoIframe() {
   return this.app.testHelpers.find('iframe').length > 0;
@@ -13,5 +14,10 @@ export default function(app) {
 
   return wait().then(() => {
     Test.unregisterWaiter(ctx, hasNoIframe);
+    return RSVP.resolve();
+  }).then(() => {
+    return new RSVP.Promise(function (resolve) {
+      run.later(resolve, 10);
+    });
   });
-}
+}