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

Fixtests #280

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
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
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
- "6"
- "10"

sudo: required
dist: trusty
Expand All @@ -21,7 +21,14 @@ 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-2.4-stack
- EMBER_TRY_SCENARIO=ember-lts-2.8
- 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-lts-3.4
- EMBER_TRY_SCENARIO=ember-lts-3.8
- EMBER_TRY_SCENARIO=ember-lts-3.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand Down
2 changes: 1 addition & 1 deletion addon/infinite/paged-infinite-array.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var pushPromiseObjects = function(base,promise) {
var InfiniteBase = Ember.ArrayProxy.extend({
page: 1,

arrangedContent: Ember.computed('content.[]',function() {
arrangedContent: Ember.computed('content',function() {
return this.get('content');
}),

Expand Down
134 changes: 110 additions & 24 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,60 +1,144 @@
/* eslint-env node */
module.exports = {

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',
name: 'ember-2.4-stack',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
'ember-data': '2.4.3',
'ember-inflector': '^1.9.4',
'ember-source': null,
'ember-cli-shims': null,
'ember-factory-for-polyfill': '1.3.1'
}
},
bower: {
dependencies: {
'ember': '2.4.6',
'ember-cli-shims': '0.1.1'
}
}
},
{
name: 'ember-release',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#release'
'ember': 'components/ember#lts-2-8',
'ember-cli-shims': '0.1.1'
},
resolutions: {
'ember': 'release'
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
'ember-data': '2.8.1',
'ember-inflector': '^1.9.4',
'ember-source': null,
'ember-cli-shims': null,
'ember-factory-for-polyfill': '1.3.1'
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-data': '2.12.2',
'ember-inflector': '^1.9.4',
'ember-source': '2.12.2',
'ember-cli-shims': '^1.1.0'
}
}
},
{
name: 'ember-2.14-stack',
npm: {
devDependencies: {
'ember-data': '~2.14.0',
'ember-source': '~2.14.0',
}
},
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': null
'ember-data': '~2.16.0',
'ember-source': '~2.16.0',
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-data': '~2.18.0',
'ember-source': '~2.18.0',
}
},
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0',
'ember-data': '~3.4.0',
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0',
'ember-data': '~3.8.0',
}
}
},
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0',
'ember-data': '~3.12.0',
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-data': 'latest',
'ember-source': urls[0]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-data': 'beta',
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': null
'ember-data': 'canary',
'ember-source': urls[2]
}
}
},
Expand All @@ -65,4 +149,6 @@ module.exports = {
}
}
]
};
});
};
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,38 @@
"test": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^6.8.2",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-babel": "^7.13.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-version-checker": "^2.1.0",
"ember-inflector": "^3.0.1"
},
"devDependencies": {
"active-model-adapter": "2.0.3",
"active-model-adapter": "2.2.0",
"bower": "^1.8.2",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "2.16.2",
"ember-cli-app-version": "^2.0.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli": "2.18.2",
"ember-cli-app-version": "^3.2.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^4.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-data": "~2.16.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-data": "~2.18.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-load-initializers": "^2.0.0",
"ember-qunit": "^4.6.0",
"ember-resolver": "^5.1.3",
"ember-sinon": "0.7.0",
"ember-source": "~2.16.0",
"ember-source": "~2.18.0",
"ember-source-channel-url": "^1.1.0",
"express": "^4.12.4",
"glob": "^5.0.14",
"loader.js": "^4.2.3",
"loader.js": "^4.7.0",
"morgan": "^1.5.3"
},
"engines": {
Expand All @@ -61,4 +61,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
27 changes: 15 additions & 12 deletions tests/acceptance/index-test.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
import { test } from 'qunit';
import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
import { findAll, visit } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import pretenderServer from '../helpers/pretender-server';

let server = null;

moduleForAcceptance('Acceptance - Todo Index', {
beforeEach() {
module('Acceptance - Todo Index', function(hooks) {
setupApplicationTest(hooks);

hooks.beforeEach(function() {
server = pretenderServer();
},
afterEach() {
});

hooks.afterEach(function() {
server.shutdown();
}
});
});

test('Should showo todos', function(assert) {
assert.expect(1);
visit("/todos/remote").then(function() {
assert.equal(find(".todo").length, 10);
test('Should showo todos', async function(assert) {
await visit("/todos/remote");
assert.equal(findAll(".todo").length, 10)
});
});
Loading