Skip to content

Commit

Permalink
0.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Selden committed Jan 25, 2015
1 parent eb5319e commit 237c74c
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 8 deletions.
12 changes: 12 additions & 0 deletions .npmignore
@@ -0,0 +1,12 @@
bower_components/
tests/

.bowerrc
.editorconfig
.ember-cli
.travis.yml
.npmignore
**/.gitkeep
bower.json
Brocfile.js
testem.json
5 changes: 3 additions & 2 deletions 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.
Expand Down
Empty file added addon/.gitkeep
Empty file.
Empty file added app/.gitkeep
Empty file.
4 changes: 2 additions & 2 deletions bower.json
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion testem.json
@@ -1,6 +1,6 @@
{
"framework": "qunit",
"test_page": "tests/index.html",
"test_page": "tests/index.html?hidepassed",
"launch_in_ci": [
"PhantomJS"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/test-helper.js
Expand Up @@ -7,6 +7,6 @@ setResolver(resolver);

document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');

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;

0 comments on commit 237c74c

Please sign in to comment.