Skip to content

Commit 4540780

Browse files
authored
Merge pull request #933 from mansona/update-smoke-test
Update smoke test to fix CI
2 parents 4c675cf + 7cabca0 commit 4540780

23 files changed

Lines changed: 2060 additions & 3959 deletions

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ jobs:
7373
- ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config.js' --skip-cleanup true
7474

7575
# try:ember
76-
- ./node_modules/.bin/ember try:ember '> 3.26.0 < 3.28.0'
77-
- ./node_modules/.bin/ember try:ember '3.18.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
78-
- ./node_modules/.bin/ember try:ember '3.24.0' --skip-cleanup=true
76+
- ./node_modules/.bin/ember try:ember '> 3.28.0 < 4.2.0'
77+
- ./node_modules/.bin/ember try:ember '4.1.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
78+
- ./node_modules/.bin/ember try:ember '4.2.0' --skip-cleanup=true
7979

8080
# try:config
8181
- ./node_modules/.bin/ember try:config

smoke-test-app/.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

smoke-test-app/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

smoke-test-app/.eslintrc.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ module.exports = {
4141
browser: false,
4242
node: true,
4343
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
44+
extends: ['plugin:n/recommended'],
4645
},
4746
{
48-
// Test files:
47+
// test files
4948
files: ['tests/**/*-test.{js,ts}'],
5049
extends: ['plugin:qunit/recommended'],
5150
},

smoke-test-app/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

smoke-test-app/.npmignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
2021
/.template-lintrc.js
2122
/.travis.yml
2223
/.watchmanconfig
2324
/bower.json
24-
/config/ember-try.js
2525
/CONTRIBUTING.md
2626
/ember-cli-build.js
2727
/testem.js
@@ -33,4 +33,7 @@
3333
# ember-try
3434
/.node_modules.ember-try/
3535
/bower.json.ember-try
36+
/npm-shrinkwrap.json.ember-try
3637
/package.json.ember-try
38+
/package-lock.json.ember-try
39+
/yarn.lock.ember-try

smoke-test-app/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

smoke-test-app/.prettierrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

smoke-test-app/.travis.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

smoke-test-app/README.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
1-
smoke-test-app
2-
==============================================================================
1+
# smoke-test-app
32

43
[Short description of the addon.]
54

65

7-
Compatibility
8-
------------------------------------------------------------------------------
6+
## Compatibility
97

10-
* Ember.js v3.24 or above
11-
* Ember CLI v3.24 or above
12-
* Node.js v12 or above
8+
* Ember.js v3.28 or above
9+
* Ember CLI v3.28 or above
10+
* Node.js v14 or above
1311

1412

15-
Installation
16-
------------------------------------------------------------------------------
13+
## Installation
1714

1815
```
1916
ember install smoke-test-app
2017
```
2118

2219

23-
Usage
24-
------------------------------------------------------------------------------
20+
## Usage
2521

2622
[Longer description of how to use the addon in apps.]
2723

2824

29-
Contributing
30-
------------------------------------------------------------------------------
25+
## Contributing
3126

3227
See the [Contributing](CONTRIBUTING.md) guide for details.
3328

3429

35-
License
36-
------------------------------------------------------------------------------
30+
## License
3731

3832
This project is licensed under the [MIT License](LICENSE.md).

0 commit comments

Comments
 (0)