Upgrade to ember-cli/ember @2.11.0

DockYard · Jan 28, 2017 · 51518bf · 51518bf
1 parent e143dbd
commit 51518bf
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist

diff --git a/bower.json b/bower.json
@@ -1,7 +1,4 @@
 {
   "name": "ember-composable-helpers",
-  "dependencies": {
-    "ember": "~2.9.0",
-    "ember-cli-shims": "0.1.3"
-  }
+  "dependencies": {}
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -8,71 +8,114 @@ module.exports = {
       name: 'ember-pre-2',
       bower: {
         dependencies: {
-          "ember": "~1.13.0"
+          'ember': '~1.13.0'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
       name: 'ember-2',
       bower: {
         dependencies: {
-          "ember": "~2.0.0"
+          'ember': '~2.0.0'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-lts',
+      name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          "ember": "~2.4.0"
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-latest',
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          "ember": "release"
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          "ember": "release"
+          'ember': 'lts-2-8'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-beta',
-      allowedToFail: true,
+      name: 'ember-release',
       bower: {
         dependencies: {
-          "ember": "beta"
+          'ember': 'components/ember#release'
         },
         resolutions: {
-          "ember": "beta"
+          'ember': 'release'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-canary',
+      name: 'ember-beta',
       allowedToFail: true,
       bower: {
         dependencies: {
-          "ember": "canary"
+          'ember': 'components/ember#beta'
         },
         resolutions: {
-          "ember": "canary"
+          'ember': 'beta'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-alpha',
+      name: 'ember-canary',
       allowedToFail: true,
       bower: {
         dependencies: {
-          "ember": "alpha"
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          "ember": "alpha"
+          'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

diff --git a/package.json b/package.json
@@ -27,15 +27,16 @@
     "broccoli-asset-rev": "^2.4.5",
     "chai": "^3.5.0",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.9.1",
+    "ember-cli": "2.11.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
-    "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-jshint": "^1.0.4",
+    "ember-cli-jshint": "^2.0.1",
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "^0.2.9",
+    "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",
@@ -44,9 +45,10 @@
     "ember-each-in-polyfill": "^0.1.4",
     "ember-exam": "0.4.6",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
     "ember-sinon": "0.5.0",
+    "ember-source": "^2.11.0",
     "ember-suave": "4.0.0",
     "loader.js": "^4.0.10",
     "mocha": "^2.4.5"

diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -11,12 +11,12 @@ export default function(name, options = {}) {
       this.application = startApp();
 
       if (options.beforeEach) {
-        return options.beforeEach(...arguments);
+        return options.beforeEach.apply(this, arguments);
       }
     },
 
     afterEach() {
-      let afterEach = options.afterEach && options.afterEach(...arguments);
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
       return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });