diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..0533b91 --- /dev/null +++ b/.npmignore @@ -0,0 +1,12 @@ +bower_components/ +tests/ + +.bowerrc +.editorconfig +.ember-cli +.travis.yml +.npmignore +**/.gitkeep +bower.json +Brocfile.js +testem.json diff --git a/Brocfile.js b/Brocfile.js index a69fc99..042a64d 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -1,8 +1,9 @@ +/* jshint node: true */ /* global require, module */ -var EmberApp = require('ember-cli/lib/broccoli/ember-app'); +var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); -var app = new EmberApp(); +var app = new EmberAddon(); // Use `app.import` to add additional libraries to the generated // output files. diff --git a/addon/.gitkeep b/addon/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/.gitkeep b/app/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/bower.json b/bower.json index c605754..de24286 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,7 @@ "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4", "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", "ember-qunit": "0.1.8", - "ember-qunit-notifications": "0.0.4", - "qunit": "~1.15.0" + "ember-qunit-notifications": "0.0.5", + "qunit": "~1.17.1" } } \ No newline at end of file diff --git a/package.json b/package.json index bd3df9d..691a70a 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "devDependencies": { "broccoli-asset-rev": "^2.0.0", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.1.7", + "ember-cli": "0.1.8", + "ember-cli-6to5": "0.2.1", "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.7", - "ember-cli-6to5": "0.2.1", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.1.2", diff --git a/testem.json b/testem.json index eff93f9..42a4ddb 100644 --- a/testem.json +++ b/testem.json @@ -1,6 +1,6 @@ { "framework": "qunit", - "test_page": "tests/index.html", + "test_page": "tests/index.html?hidepassed", "launch_in_ci": [ "PhantomJS" ], diff --git a/tests/test-helper.js b/tests/test-helper.js index b5f6449..b7f4520 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -7,6 +7,6 @@ setResolver(resolver); document.write('
'); -QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'}); +QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' }); var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible'; document.getElementById('ember-testing-container').style.visibility = containerVisibility;