Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Ember CLI 0.2.3 #72

Merged
merged 6 commits into from
Apr 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,24 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
indent_size = 4

[*.js]
indent_style = space
indent_size = 2
indent_size = 4

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2
indent_size = 4

[*.css]
indent_style = space
indent_size = 2
indent_size = 4

[*.html]
indent_style = space
indent_size = 2
indent_size = 4

[*.{diff,md}]
trim_trailing_whitespace = false
Empty file modified .gitignore
100755 → 100644
Empty file.
Empty file modified Brocfile.js
100755 → 100644
Empty file.
Empty file modified CHANGELOG.md
100755 → 100644
Empty file.
Empty file modified CLA-CORPORATE.md
100755 → 100644
Empty file.
Empty file modified CLA-INDIVIDUAL.md
100755 → 100644
Empty file.
Empty file modified CONTRIBUTING.md
100755 → 100644
Empty file.
Empty file modified LICENSE.md
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions README.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[![Latest Release](https://img.shields.io/github/release/softlayer/sl-ember-test-helpers.svg)](https://github.com/softlayer/sl-ember-test-helpers/releases) ![Ember CLI version](https://img.shields.io/badge/ember%20cli-0.1.15-orange.svg) [![License](https://img.shields.io/npm/l/sl-ember-test-helpers.svg)](LICENSE.md) [![Downloads](https://img.shields.io/npm/dm/sl-ember-test-helpers.svg)](https://www.npmjs.com/package/sl-ember-test-helpers)
[![Latest Release](https://img.shields.io/github/release/softlayer/sl-ember-test-helpers.svg)](https://github.com/softlayer/sl-ember-test-helpers/releases) ![Ember CLI version](https://img.shields.io/badge/ember%20cli-0.2.3-orange.svg) [![License](https://img.shields.io/npm/l/sl-ember-test-helpers.svg)](LICENSE.md) [![Downloads](https://img.shields.io/npm/dm/sl-ember-test-helpers.svg)](https://www.npmjs.com/package/sl-ember-test-helpers)

[![Dependencies](https://img.shields.io/david/softlayer/sl-ember-test-helpers.svg)](https://david-dm.org/softlayer/sl-ember-test-helpers) [![Dev Dependencies](https://img.shields.io/david/dev/softlayer/sl-ember-test-helpers.svg)](https://david-dm.org/softlayer/sl-ember-test-helpers#info=devDependencies)

Expand Down Expand Up @@ -114,7 +114,7 @@ There are several utility functions provided in the */test-support/helpers/sl/ut
## Install this addon as a Node module

```
ember install:addon sl-ember-test-helpers
ember install sl-ember-test-helpers
```

## If running Synchronous tests, such as Unit Tests
Expand Down
Empty file modified RELEASE-INSTRUCTIONS.md
100755 → 100644
Empty file.
16 changes: 7 additions & 9 deletions bower.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{
"name": "sl-ember-test-helpers",
"dependencies": {
"handlebars": "~1.3.0",
"jquery": "^1.11.1",
"ember": "1.8.1",
"ember-data": "1.0.0-beta.14.1",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember": "1.11.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.2.8",
"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.1",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
},
"devDependencies": {
Expand Down
Empty file modified index.js
100755 → 100644
Empty file.
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test"
"test": "ember try:testall"
},
"homepage": "http://softlayer.github.io/sl-ember-test-helpers",
"bugs": "https://github.com/softlayer/sl-ember-test-helpers/issues",
Expand All @@ -26,20 +26,22 @@
},
"author": "Jeremy Brown <jeremy@notmessenger.com> (http://www.notmessenger.com)",
"license": "MIT",
"dependencies": {
"ember-cli-babel": "^5.0.0"
},
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"broccoli-asset-rev": "^2.0.2",
"broccoli-string-replace": "0.0.2",
"ember-cli": "0.1.15",
"ember-cli-app-version": "0.3.1",
"ember-cli-babel": "^4.0.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.7",
"ember-cli-qunit": "0.3.10",
"ember-cli-uglify": "1.0.1",
"ember-export-application-global": "^1.0.2",
"express": "^4.8.5",
"glob": "^4.0.5"
"ember-disable-prototype-extensions": "^1.0.0",
"ember-try": "0.0.4"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this entry

}
}
4 changes: 3 additions & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;

Ember.MODEL_FACTORY_INJECTIONS = true;

var App = Ember.Application.extend({
App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Expand Down
4 changes: 1 addition & 3 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ var Router = Ember.Router.extend({
location: config.locationType
});

Router.map(function() {
export default Router.map( function() {
});

export default Router;
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<br><br>
<div class="row">
<div class="col-md-12 text-center">
<p>ember install:addon sl-ember-test-helpers</p>
<p>ember install sl-ember-test-helpers</p>
<p><a href="https://github.com/softlayer/sl-ember-test-helpers/blob/master/LICENSE.md">MIT Licensed</a></p>
</div>
</div>
Expand Down