-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #136 from yapplabs/ember-cli-and-try
Update ember-cli and use ember try's versionCompatibility
- Loading branch information
Showing
16 changed files
with
173 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +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 | ||
| ember-cli-build.js | ||
| Brocfile.js | ||
| testem.json | ||
| testem.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,24 @@ | ||
| --- | ||
| language: node_js | ||
| node_js: | ||
| - "0.12" | ||
| - "4" | ||
|
|
||
| sudo: false | ||
|
|
||
| cache: | ||
| directories: | ||
| - node_modules | ||
|
|
||
| env: | ||
| - EMBER_TRY_SCENARIO=1.10.1 | ||
| - EMBER_TRY_SCENARIO=1.11.3 | ||
| - EMBER_TRY_SCENARIO=1.12.1 | ||
| - EMBER_TRY_SCENARIO=1.13.10 | ||
| - EMBER_TRY_SCENARIO=ember-release | ||
| - EMBER_TRY_SCENARIO=ember-beta | ||
| - EMBER_TRY_SCENARIO=ember-canary | ||
|
|
||
| matrix: | ||
| allow_failures: | ||
| - env: EMBER_TRY_SCENARIO=ember-beta | ||
| - env: EMBER_TRY_SCENARIO=ember-canary | ||
|
|
||
| before_install: | ||
| - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH | ||
| - "npm config set spin false" | ||
| - "npm install -g npm@^2" | ||
| - npm config set spin false | ||
| - npm install -g bower | ||
| - npm install phantomjs-prebuilt | ||
|
|
||
| install: | ||
| - npm install -g bower | ||
| - npm install | ||
| - bower install | ||
|
|
||
| script: | ||
| - ember try $EMBER_TRY_SCENARIO test --skip-cleanup | ||
| # Usually, it's ok to finish the test scenario without reverting | ||
| # to the addon's original dependency state, skipping "cleanup". | ||
| - ember try:each --skip-cleanup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "ignore_dirs": ["tmp"] | ||
| "ignore_dirs": ["tmp", "dist"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,10 @@ | ||
| { | ||
| "name": "ember-modal-dialog", | ||
| "dependencies": { | ||
| "ember": "1.13.10", | ||
| "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.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.15", | ||
| "ember-qunit-notifications": "0.0.7", | ||
| "ember-resolver": "~0.1.18", | ||
| "jquery": "1.11.3", | ||
| "loader.js": "ember-cli/loader.js#3.2.1", | ||
| "qunit": "~1.19.0", | ||
| "bind-polyfill": "^1.0.0" | ||
| "bind-polyfill": "^1.0.0", | ||
| "ember": "~2.6.0", | ||
| "ember-cli-shims": "0.1.1", | ||
| "ember-cli-test-loader": "0.2.2", | ||
| "ember-qunit-notifications": "0.1.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,68 @@ | ||
| module.exports = { | ||
| scenarios: [ | ||
| { | ||
| name: 'default', | ||
| dependencies: { } | ||
| }, | ||
| { | ||
| name: '1.10.1', | ||
| dependencies: { | ||
| 'ember': '1.10.1', | ||
| 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' | ||
| } | ||
| }, | ||
| { | ||
| name: '1.11.3', | ||
| dependencies: { | ||
| 'ember': '1.11.3', | ||
| 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' | ||
| } | ||
| }, | ||
| { | ||
| name: '1.12.1', | ||
| dependencies: { | ||
| 'ember': '1.12.1' | ||
| } | ||
| }, | ||
| { | ||
| name: '1.13.10', | ||
| dependencies: { | ||
| 'ember': '1.13.10' | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-release', | ||
| dependencies: { | ||
| 'ember': 'components/ember#release' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'release' | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| dependencies: { | ||
| 'ember': 'components/ember#beta' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'beta' | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| dependencies: { | ||
| 'ember': 'components/ember#canary' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'canary' | ||
| } | ||
| } | ||
| ] | ||
| useVersionCompatibility: true | ||
| // scenarios: [ | ||
| // { | ||
| // name: 'default', | ||
| // dependencies: { } | ||
| // }, | ||
| // { | ||
| // name: '1.10.1', | ||
| // dependencies: { | ||
| // 'ember': '1.10.1', | ||
| // 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: '1.11.3', | ||
| // dependencies: { | ||
| // 'ember': '1.11.3', | ||
| // 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: '1.12.1', | ||
| // dependencies: { | ||
| // 'ember': '1.12.1' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: '1.13.10', | ||
| // dependencies: { | ||
| // 'ember': '1.13.10' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: '2.4.5', | ||
| // dependencies: { | ||
| // 'ember': '2.4.5' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: 'ember-release', | ||
| // dependencies: { | ||
| // 'ember': 'components/ember#release' | ||
| // }, | ||
| // resolutions: { | ||
| // 'ember': 'release' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: 'ember-beta', | ||
| // dependencies: { | ||
| // 'ember': 'components/ember#beta' | ||
| // }, | ||
| // resolutions: { | ||
| // 'ember': 'beta' | ||
| // } | ||
| // }, | ||
| // { | ||
| // name: 'ember-canary', | ||
| // dependencies: { | ||
| // 'ember': 'components/ember#canary' | ||
| // }, | ||
| // resolutions: { | ||
| // 'ember': 'canary' | ||
| // } | ||
| // } | ||
| // ] | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /*jshint node:true*/ | ||
| 'use strict'; | ||
|
|
||
| module.exports = function(/* environment, appConfig */) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| /*jshint node:true*/ | ||
| module.exports = { | ||
| "framework": "qunit", | ||
| "test_page": "tests/index.html?hidepassed", | ||
| "disable_watching": true, | ||
| "launch_in_ci": [ | ||
| "PhantomJS" | ||
| ], | ||
| "launch_in_dev": [ | ||
| "PhantomJS", | ||
| "Chrome" | ||
| ] | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import Resolver from 'ember-resolver'; | ||
|
|
||
| export default Resolver; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import Ember from 'ember'; | ||
|
|
||
| export default function destroyApp(application) { | ||
| Ember.run(application, 'destroy'); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { module } from 'qunit'; | ||
| import Ember from 'ember'; | ||
| import startApp from '../helpers/start-app'; | ||
| import destroyApp from '../helpers/destroy-app'; | ||
|
|
||
| const { RSVP: { Promise } } = Ember; | ||
|
|
||
| export default function(name, options = {}) { | ||
| module(name, { | ||
| beforeEach() { | ||
| this.application = startApp(); | ||
|
|
||
| if (options.beforeEach) { | ||
| return options.beforeEach.apply(this, arguments); | ||
| } | ||
| }, | ||
|
|
||
| afterEach() { | ||
| let afterEach = options.afterEach && options.afterEach.apply(this, arguments); | ||
| return Promise.resolve(afterEach).then(() => destroyApp(this.application)); | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.