Skip to content
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
8 changes: 3 additions & 5 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"disableAnalytics": false
"isTypeScriptProject": false
}
8 changes: 1 addition & 7 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

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

/docs/
/fastboot-tests/fixtures/
/fastboot-tests/fixtures/
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

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

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/_site
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand All @@ -29,11 +24,16 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# IDE
/.idea/
/*.iml
/.vscode/
/.history/

# broccoli-debug
/DEBUG/
11 changes: 4 additions & 7 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -22,8 +19,6 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
testem.*
Expand All @@ -34,8 +29,10 @@ testem.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

/.publish
/.github
Expand Down
9 changes: 1 addition & 8 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,11 @@

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ To run tests in Bootstrap 3 mode, prefix these commands with `BOOTSTRAPVERSION=3
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"lodash": "^4.18.1",
"testem": "~3.18.0",
"@embroider/addon-shim": "1.10.2",
"ember-a11y-testing/ember-auto-import": "^2.10.0",
"@babel/plugin-transform-modules-systemjs": "^7.29.4",
"browserslist": "^4.28.7",
"tmp": "^0.2.7",
Expand Down Expand Up @@ -103,7 +102,7 @@
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.23.2",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.9.6",
"@ember/test-helpers": "^3.2.0",
"@embroider/test-setup": "^3.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand All @@ -113,23 +112,24 @@
"chai": "^4.3.4",
"chai-things": "^0.2.0",
"concurrently": "^8.2.2",
"ember-a11y-testing": "^4.0.7",
"ember-cli": "~3.28.6",
"ember-a11y-testing": "^6.1.1",
"ember-cli": "~5.4.2",
"ember-cli-app-version": "^6.0.1",
"ember-cli-blueprint-test-helpers": "^0.19.1",
"ember-cli-browserstack": "^1.1.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-content-security-policy": "^2.0.0-4",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-fastboot": "^4.1.1",
"ember-cli-fastboot-testing": "0.6.1",
"ember-cli-fastboot-testing": "^0.7.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-test-loader": "^3.0.0",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.3.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^6.2.0",
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.1",
"ember-sinon": "^5.0.0",
"ember-sinon-qunit": "^5.0.0",
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Dummy</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.28.6",
"version": "5.4.2",
"blueprints": [
{
"name": "addon",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'dummy',
environment,
rootURL: '/',
Expand Down
Empty file removed tests/helpers/.gitkeep
Empty file.
42 changes: 42 additions & 0 deletions tests/helpers/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import {
setupApplicationTest as upstreamSetupApplicationTest,
setupRenderingTest as upstreamSetupRenderingTest,
setupTest as upstreamSetupTest,
} from 'ember-qunit';

// This file exists to provide wrappers around ember-qunit's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

function setupApplicationTest(hooks, options) {
upstreamSetupApplicationTest(hooks, options);

// Additional setup for application tests can be done here.
//
// For example, if you need an authenticated session for each
// application test, you could do:
//
// hooks.beforeEach(async function () {
// await authenticateSession(); // ember-simple-auth
// });
//
// This is also a good place to call test setup functions coming
// from other addons:
//
// setupIntl(hooks); // ember-intl
// setupMirage(hooks); // ember-cli-mirage
}

function setupRenderingTest(hooks, options) {
upstreamSetupRenderingTest(hooks, options);

// Additional setup for rendering tests can be done here.
}

function setupTest(hooks, options) {
upstreamSetupTest(hooks, options);

// Additional setup for unit tests can be done here.
}

export { setupApplicationTest, setupRenderingTest, setupTest };
6 changes: 3 additions & 3 deletions tests/helpers/setup-stylesheet-support.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import { A } from '@ember/array';

export default function ({ beforeEach, afterEach }) {
let styleSheet = A(Array.prototype.slice.call(document.styleSheets)).find(
(sheet) => sheet.href.indexOf('test-support.css') !== -1
(sheet) => sheet.href.indexOf('dummy.css') !== -1
);
let numberOfInsertedRules;

beforeEach(function () {
numberOfInsertedRules = 0;

this.insertCSSRule = function (rule) {
styleSheet.insertRule(rule, styleSheet.length);
styleSheet.insertRule(rule, styleSheet.cssRules.length);
numberOfInsertedRules++;
};
});
Expand All @@ -19,7 +19,7 @@ export default function ({ beforeEach, afterEach }) {
// since we insert the rules at the end of the stylesheet, we could safely
// remove the same amount of rules from the end as we have inserted
for (let i = 1; i <= numberOfInsertedRules; i++) {
styleSheet.deleteRule(styleSheet.length);
styleSheet.deleteRule(styleSheet.cssRules.length - 1);
}
});
}
1 change: 0 additions & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Dummy Tests</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
Loading
Loading