Skip to content

Commit

Permalink
Ember 3.0 + Updated Tests (#576)
Browse files Browse the repository at this point in the history
  • Loading branch information
offirgolan authored Mar 31, 2018
1 parent 24d0839 commit 79a41fa
Show file tree
Hide file tree
Showing 46 changed files with 5,608 additions and 5,375 deletions.
9 changes: 0 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
}
}
]
};
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ env:
matrix:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-lts-2.18
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ You can also learn more by watching this Global Ember Meetup talk:

[![Introduction to ember-cp-validations](https://i.vimeocdn.com/video/545445254.png?mw=1920&mh=1080&q=70)](https://vimeo.com/146857699)

## Installation
Installation
------------------------------------------------------------------------------

```shell
ember install ember-cp-validations
Expand Down
2 changes: 2 additions & 0 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

@import "ember-bootstrap/bootstrap";
130 changes: 59 additions & 71 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,75 +1,63 @@
module.exports = {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
ember: 'components/ember#release'
'use strict';

const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then(urls => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
resolutions: {
ember: 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
ember: 'components/ember#beta'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
resolutions: {
ember: 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
ember: 'components/ember#canary'
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
resolutions: {
ember: 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
};
});
};
8 changes: 7 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
module.exports = function(defaults) {
let app = new EmberAddon(defaults, {
snippetSearchPaths: ['addon', 'tests/dummy/app'],
snippetPaths: ['snippets', 'tests/dummy/snippets']
snippetPaths: ['snippets', 'tests/dummy/snippets'],

'ember-bootstrap': {
bootstrapVersion: 3,
importBootstrapFont: true,
importBootstrapCSS: false
}
});

/*
Expand Down
19 changes: 12 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,29 @@
],
"license": "MIT",
"devDependencies": {
"bootstrap-sass": "^3.3.7",
"broccoli-asset-rev": "^2.4.6",
"ember-cli": "~2.18.2",
"ember-bootstrap": "^1.2.1",
"ember-cli": "~3.0.2",
"ember-cli-app-version": "^2.0.0",
"ember-cli-autoprefixer": "^0.7.0",
"ember-cli-changelog": "0.3.4",
"ember-cli-code-coverage": "0.4.1",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-github-pages": "^0.1.2",
"ember-cli-github-pages": "^0.2.0",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-less": "1.5.4",
"ember-cli-moment-shim": "^3.3.3",
"ember-cli-qunit": "^4.1.1",
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-sass": "^7.1.7",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^2.0.0",
"ember-cli-yuidoc": "^0.8.8",
"ember-code-snippet": "^1.7.0",
"ember-code-snippet": "^2.0.1",
"ember-data": "^2.18.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
Expand All @@ -65,16 +67,19 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit-nice-errors": "^1.2.0",
"ember-resolver": "^4.3.0",
"ember-source": "~2.18.0",
"ember-truth-helpers": "1.3.0",
"ember-source": "~3.0.0",
"ember-source-channel-url": "^1.0.1",
"ember-test-selectors": "^0.3.8",
"ember-truth-helpers": "2.0.0",
"ember-try": "^0.2.23",
"eslint": "^4.17.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-prettier": "^2.6.0",
"jquery": "^2.2.4",
"loader.js": "^4.2.3",
"prettier": "^1.10.2",
"qunit-dom": "^0.5.0",
"yuidoc-ember-theme": "^1.4.0"
},
"keywords": [
Expand Down
Loading

0 comments on commit 79a41fa

Please sign in to comment.