upgrades to 2.11 (#59)

LocusEnergy · Feb 22, 2017 · 5184831 · 5184831
1 parent 3c7feae
commit 5184831
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ env:
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
@@ -26,10 +27,9 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install
@@ -38,4 +38,4 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ This addon includes an `{{ember-sparkles}}`, which renders a responsive SVG cont
 ### example
 
 ```hbs
-{{#ember-sparkes
+{{#ember-sparkles
   data=your-data
 
   input-key='ts'
@@ -54,7 +54,7 @@ This addon includes an `{{ember-sparkles}}`, which renders a responsive SVG cont
   as |chart|
 }}
   {{!render your charts here}}
-{{/ember-sparkes}}
+{{/ember-sparkles}}
 ```
 
 ### Properties (WIP)

diff --git a/bower.json b/bower.json
@@ -1,8 +1,6 @@
 {
   "name": "ember-sparkles",
   "dependencies": {
-    "ember": "~2.10.0",
-    "ember-cli-shims": "0.1.3",
     "moment-range": "^2.2.0"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -10,6 +10,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-4'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -21,6 +26,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-8'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -32,6 +42,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -43,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -54,6 +74,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

diff --git a/package.json b/package.json
@@ -21,31 +21,33 @@
   "devDependencies": {
     "babel-eslint": "^6.1.2",
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "2.4.1",
-    "ember-cli": "2.10.0",
+    "ember-ajax": "^2.5.5",
+    "ember-cli": "^2.11.1",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-deploy": "0.5.1",
     "ember-cli-eslint": "3.0.0",
     "ember-cli-github-pages": "0.1.0",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
-    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-inject-live-reload": "^1.6.1",
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "1.0.0-beta.2",
     "ember-cli-sass": "5.6.0",
+    "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-code-snippet": "1.4.0",
     "ember-computed-decorators": "0.2.2",
     "ember-concurrency": "0.7.8",
-    "ember-data": "^2.10.0",
+    "ember-data": "^2.11.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
     "ember-let": "0.5.4",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
+    "ember-source": "~2.11.0",
     "loader.js": "^4.0.10"
   },
   "keywords": [
@@ -56,7 +58,7 @@
   ],
   "dependencies": {
     "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars": "^1.1.1",
     "ember-composable-helpers": "2.0.0",
     "ember-d3": "^0.3.2",
     "ember-d3-helpers": "0.5.14",

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,8 +5,8 @@ import config from '../../config/environment';
 export default function startApp(attrs) {
   let application;
 
-  // use defaults, but you can override
-  let attributes = Ember.assign({}, config.APP, attrs);
+  let attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Ember.run(() => {
     application = Application.create(attributes);