Merge pull request #124 from notmessenger/Issue107

Closes #107
softlayer · Aug 3, 2015 · 14dfc4e · 14dfc4e
2 parents 69cf699 + d2841ed
commit 14dfc4e
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 67 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,7 @@
 bower_components/
 tests/
 tmp/
+dist/
 
 .bowerrc
 .editorconfig
@@ -9,5 +10,6 @@ tmp/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json
diff --git a/Brocfile.js b/Brocfile.js
diff --git a/bower.json b/bower.json
@@ -1,13 +1,13 @@
 {
   "name": "sl-ember-test-helpers",
   "dependencies": {
-    "ember": "1.12.0",
+    "ember": "1.13.5",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.7",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -0,0 +1,48 @@
+/* global require, module */
+const EmberApp = require( 'ember-cli/lib/broccoli/ember-addon' );
+const packageConfig = require( './package.json' );
+const replace = require( 'broccoli-string-replace' );
+
+module.exports = function( defaults ) {
+    const app = new EmberApp( defaults, {
+        // Add options here
+    });
+
+    /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+    */
+
+    // Testing dependencies
+    app.import( app.bowerDirectory + '/sinonjs/sinon.js', {
+        type: 'test'
+    });
+
+    app.import( app.bowerDirectory + '/sinon-qunit/lib/sinon-qunit.js', {
+        type: 'test'
+    });
+
+    const tree = replace( app.toTree(), {
+        files: [
+            'index.html',
+            'assets/dummy.js'
+        ],
+        patterns: [
+            {
+                match: /REPLACE_META_DESCRIPTION/g,
+                replacement: packageConfig.description
+            }, {
+                match: /REPLACE_META_KEYWORDS/g,
+                replacement: packageConfig.keywords.join( ', ' ) +
+                    ', ember, ember cli'
+            }, {
+                match: /REPLACE_APPLICATION_VERSION/g,
+                replacement: packageConfig.version
+             }
+        ]
+    });
+
+    return tree;
+};
diff --git a/package.json b/package.json
@@ -36,19 +36,21 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-string-replace": "0.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.6",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-doc-server": "1.1.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-jsdoc": "1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.18",
+    "ember-cli-sri": "^1.0.1",
     "ember-cli-uglify": "^1.0.1",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.2",
+    "ember-export-application-global": "^1.0.3",
     "ember-try": "0.0.6",
     "sl-eslint": "0.1.0"
   }

diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -29,7 +29,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -50,5 +50,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -5,5 +5,7 @@ const Router = Ember.Router.extend({
     location: config.locationType
 });
 
-export default Router.map( function() {
+Router.map( function() {
 });
+
+export default Router;
diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt
@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow: