Skip to content

Commit

Permalink
fix: update tests to RFC 232 style
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Sep 2, 2018
1 parent dd36367 commit 76c5142
Show file tree
Hide file tree
Showing 15 changed files with 770 additions and 544 deletions.
16 changes: 16 additions & 0 deletions .eslintignore
@@ -0,0 +1,16 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
55 changes: 27 additions & 28 deletions .eslintrc.js
Expand Up @@ -2,50 +2,49 @@ module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: "module"
sourceType: 'module'
},
plugins: ["ember"],
extends: ["eslint:recommended", "plugin:ember/recommended"],
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {},
rules: {
},
overrides: [
// node files
{
files: [
"index.js",
"testem.js",
"ember-cli-build.js",
"config/**/*.js",
"tests/dummy/config/**/*.js"
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
excludedFiles: ["app/**", "addon/**"],
parserOptions: {
sourceType: "script",
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ["node"],
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
}
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
}
]
};
24 changes: 11 additions & 13 deletions .gitignore
@@ -1,25 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

jsconfig.json
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
8 changes: 5 additions & 3 deletions .travis.yml
@@ -1,10 +1,8 @@
language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- stable

sudo: false
sudo: required
dist: trusty

addons:
Expand Down Expand Up @@ -32,6 +30,10 @@ matrix:
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_script:
- sudo chmod 4755 /opt/google/chrome/chrome-sandbox
- sudo chown root /opt/google/chrome/chrome-sandbox

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
Expand Down
136 changes: 66 additions & 70 deletions config/ember-try.js
@@ -1,75 +1,71 @@
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.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
resolutions: {
ember: 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
ember: 'components/ember#beta'
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
resolutions: {
ember: 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
ember: 'components/ember#canary'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
resolutions: {
ember: 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
]
};
});
};
33 changes: 22 additions & 11 deletions package.json
Expand Up @@ -22,35 +22,42 @@
"author": "Mike North <michael.l.north@gmail.com> (http://mike.works)",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.6",
"@ember/test-helpers": "^0.7.25",
"@types/ember": "^2.8.32",
"@types/ember-data": "^2.14.18",
"@types/ember-qunit": "^3.0.3",
"@types/ember__test-helpers": "^0.7.0",
"broccoli-asset-rev": "^2.7.0",
"ember-cli": "^3.3.0",
"ember-cli-dependency-checker": "^2.1.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-eslint": "^4.2.1",
"ember-cli-github-pages": "0.1.3",
"ember-cli-htmlbars": "^2.0.2",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-pretender": "^1.0.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-qunit": "^4.3.2",
"ember-cli-shims": "^1.1.0",
"ember-cli-test-loader": "^2.2.0",
"ember-cli-uglify": "^2.0.0",
"ember-code-snippet": "^2.0.0",
"ember-data": "^2.6.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-data": "~3.4.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-load-initializers": "^1.1.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.18.0",
"ember-source": "~3.4.0",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-node": "^6.0.1",
"loader.js": "^4.2.3",
"qunit-dom": "^0.6.2",
"travis-deploy-once": "^5.0.7"
},
"optionalDependencies": {
"semantic-release": "^15.9.12",
"@mike-north/js-lib-semantic-release-config": "^0.0.0-development"
"@mike-north/js-lib-semantic-release-config": "^0.0.0-development",
"semantic-release": "^15.9.12"
},
"keywords": [
"ember-addon",
Expand All @@ -61,13 +68,17 @@
"model"
],
"dependencies": {
"ember-cli-babel": "^6.0.0"
"ember-cli-babel": "^6.6.0"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "http://mike.works/ember-api-actions"
},
"release": {
"extends": "@mike-north/js-lib-semantic-release-config"
},
"toolchain": {
"node": "8.11.4",
"yarn": "1.9.2"
}
}
12 changes: 8 additions & 4 deletions testem.js
Expand Up @@ -9,13 +9,17 @@ module.exports = {
],
browser_args: {
Chrome: {
mode: 'ci',
args: [
'--disable-gpu',
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
]
].filter(Boolean)
}
}
};

0 comments on commit 76c5142

Please sign in to comment.