ember-cli 2.4.2

* Update package.json/bower.json dependencies * Use Node 4.x in tests
sir-dunxalot · Mar 25, 2016 · 7e2a63b · 7e2a63b
1 parent 1114590
commit 7e2a63b
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 69 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,13 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
-testem.json
+ember-cli-build.js
+testem.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4.4"
 
 sudo: false
 
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1-13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

diff --git a/bower.json b/bower.json
@@ -1,22 +1,14 @@
 {
   "name": "ember-tooltips",
   "dependencies": {
-    "ember": "2.1.0",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "jquery": "^1.11.3",
-    "loader.js": "3.3.0"
+    "ember": "~2.4.1",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2"
   },
   "devDependencies": {
     "compass-mixins": "~1.0.2",
-    "ember-qunit": "^0.4.17",
-    "ember-qunit-notifications": "0.1.0",
     "hammerjs": "~2.0.4",
-    "matchMedia": "0.2.0",
-    "qunit": "~1.19.0"
-  },
-  "resolutions": {
-    "ember": "2.1.0"
+    "matchMedia": "0.3.0",
+    "qunit": "~1.22.0"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -3,36 +3,53 @@ module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: {
-        'jquery': '1.11.3'
-      }
+      bower: {
+        dependencies: { },
+      },
+    },
+    {
+      name: 'ember-1-13',
+      bower: {
+        dependencies: {
+          ember: '~1.13.0',
+        },
+        resolutions: {
+          ember: '~1.13.0',
+        },
+      },
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
+      bower: {
+        dependencies: {
+          ember: 'components/ember#release',
+        },
+        resolutions: {
+          ember: 'release',
+        },
       },
-      resolutions: {
-        'ember': 'release'
-      }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
+      bower: {
+        dependencies: {
+          ember: 'components/ember#beta',
+        },
+        resolutions: {
+          ember: 'beta',
+        },
       },
-      resolutions: {
-        'ember': 'beta'
-      }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
+      bower: {
+        dependencies: {
+          ember: 'components/ember#canary',
+        },
+        resolutions: {
+          ember: 'canary',
+        },
       },
-      resolutions: {
-        'ember': 'canary'
-      }
-    }
-  ]
+    },
+  ],
 };
diff --git a/package.json b/package.json
@@ -13,31 +13,35 @@
   },
   "repository": "https://github.com/sir-dunxalot/ember-tooltips",
   "engines": {
-    "node": ">= 0.10.0"
+    "node": "4.4.x"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "1.13.8",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.4.2",
     "ember-cli-app-version": "^1.0.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-content-security-policy": "0.5.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-github-pages": "0.0.6",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.3",
+    "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sass": "4.2.1",
+    "ember-cli-sass": "^5.2.0",
+    "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.1.3",
-    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
+    "ember-load-initializers": "^0.5.0",
     "ember-paper": "0.2.8",
     "ember-suave": "1.2.3",
     "ember-resolver": "^2.0.3",
-    "ember-try": "~0.0.8",
+    "ember-try": "^0.1.2",
+    "loader.js": "^4.0.0",
     "publish": "^0.5.0",
     "rsvp": "^3.1.0"
   },

diff --git a/testem.json → testem.js b/testem.json → testem.js
@@ -1,4 +1,5 @@
-{
+/*jshint node:true*/
+module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
@@ -9,4 +10,4 @@
     "PhantomJS",
     "Chrome"
   ]
-}
+};
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember-resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -7,19 +7,19 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
 
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
 
-    {{content-for 'body-footer'}}
+    {{content-for "body-footer"}}
   </body>
 </html>
diff --git a/tests/dummy/app/resolver.js b/tests/dummy/app/resolver.js
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -13,11 +13,11 @@ export default function(name, options = {}) {
     },
 
     afterEach() {
-      destroyApp(this.application);
-
       if (options.afterEach) {
         options.afterEach.apply(this, arguments);
       }
+
+      destroyApp(this.application);
     },
   });
 }
diff --git a/tests/index.html b/tests/index.html
@@ -7,28 +7,28 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="testem.js" integrity=""></script>
     <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Resolver from 'ember-resolver';

		export default Resolver;