Skip to content

Commit 25743c5

Browse files
alexdilibertocrodriguez1a
authored andcommitted
fix(travis): ci and node v4.x (#70)
* fix(travis): add missing Bower deps for CI * fix(node): allow addon to work with Node v4.x * feat(testem): chrome headless testing in dev and ci * test(components): removing unnecessary tests
1 parent 49c70b0 commit 25743c5

File tree

8 files changed

+402
-364
lines changed

8 files changed

+402
-364
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ matrix:
2828
before_install:
2929
- curl -o- -L https://yarnpkg.com/install.sh | bash
3030
- export PATH=$HOME/.yarn/bin:$PATH
31-
- yarn global add phantomjs-prebuilt
31+
- yarn global add bower phantomjs-prebuilt
32+
- bower --version
3233
- phantomjs --version
3334

3435
install:
36+
- bower install # TODO: Remove addon's dependency on `bower`
3537
- yarn install --no-lockfile --non-interactive
3638

3739
script:

ember-cli-build.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/* eslint-env node */
2+
'use strict';
3+
24
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
35

46
module.exports = function(defaults) {

testem.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ module.exports = {
33
test_page: 'tests/index.html?hidepassed',
44
disable_watching: true,
55
launch_in_ci: [
6-
'PhantomJS'
6+
'Chrome'
77
],
88
launch_in_dev: [
9-
'PhantomJS',
109
'Chrome'
11-
]
10+
],
11+
browser_args: {
12+
Chrome: [
13+
'--disable-gpu',
14+
'--headless',
15+
'--remote-debugging-port=9222',
16+
'--window-size=1440,900'
17+
]
18+
}
1219
};

tests/dummy/config/environment.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-env node */
2+
'use strict';
23

34
module.exports = function(environment) {
45
let ENV = {

tests/integration/components/bulma-checkbox-test.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,4 @@ test('it renders', function(assert) {
1111
this.render(hbs`{{bulma-checkbox}}`);
1212

1313
assert.equal(this.$().text().trim(), '');
14-
15-
// Template block usage:
16-
this.render(hbs`
17-
{{#bulma-checkbox}}
18-
template block text
19-
{{/bulma-checkbox}}
20-
`);
21-
22-
assert.equal(this.$().text().trim(), 'template block text');
2314
});

tests/integration/components/bulma-input-test.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,4 @@ test('it renders', function(assert) {
1111
this.render(hbs`{{bulma-input}}`);
1212

1313
assert.equal(this.$().text().trim(), '');
14-
15-
// Template block usage:" + EOL +
16-
this.render(hbs`
17-
{{#bulma-input}}
18-
template block text
19-
{{/bulma-input}}
20-
`);
21-
22-
assert.equal(this.$().text().trim(), 'template block text');
2314
});

tests/integration/components/bulma-radio-test.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,4 @@ test('it renders', function(assert) {
1111
this.render(hbs`{{bulma-radio}}`);
1212

1313
assert.equal(this.$().text().trim(), '');
14-
15-
// Template block usage:
16-
this.render(hbs`
17-
{{#bulma-radio}}
18-
template block text
19-
{{/bulma-radio}}
20-
`);
21-
22-
assert.equal(this.$().text().trim(), 'template block text');
2314
});

0 commit comments

Comments
 (0)