Skip to content

Commit

Permalink
Fix the imports from the dummy app, is now test-app
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Jun 12, 2022
1 parent 067e555 commit 43c8e57
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"lint:js": "pnpm --filter '*' lint:js",
"test": "echo \"Error: no test specified\" && exit 1"
"test": "pnpm --filter test-app test:ember"
},
"keywords": [],
"author": "",
Expand Down
6 changes: 6 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test-app/app/app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Application from '@ember/application';

import config from 'dummy/config/environment';
import loadInitializers from 'ember-load-initializers';
import Resolver from 'ember-resolver';
import config from 'test-app/config/environment';

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
2 changes: 1 addition & 1 deletion test-app/app/router.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import EmberRouter from '@ember/routing/router';

import config from 'dummy/config/environment';
import config from 'test-app/config/environment';

export default class Router extends EmberRouter {
location = config.locationType;
Expand Down
2 changes: 1 addition & 1 deletion test-app/config/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// const defaultTheme = require('tailwindcss/defaultTheme');

let extensions = 'html,hbs,js,ts,gjs,gts';
let paths = ['./tests/dummy/**/*', './addon/**/*'];
let paths = ['./tests/**/*', './app/**/*'];

module.exports = {
content: paths.map((glob) => `${glob}.{${extensions}}`),
Expand Down
4 changes: 1 addition & 3 deletions test-app/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ module.exports = function (defaults) {

postcssOptions: {
compile: {
plugins: [
require('tailwindcss')('./tests/dummy/config/tailwind.config.js'),
],
plugins: [require('tailwindcss')('./config/tailwind.config.js')],
},
},
});
Expand Down
3 changes: 3 additions & 0 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
},
"dependencies": {
"@tailwindcss/typography": "^0.5.2",
"ember-concurrency": "^2.1.2",
"ember-headlessui": "*",
"ember-modifier": "4.0.0-beta.1",
"tailwindcss": "^3.0.24"
},
Expand All @@ -37,6 +39,7 @@
"@nullvoxpopuli/eslint-configs": "^1.5.1",
"@testing-library/dom": "^8.1.0",
"@testing-library/user-event": "^13.1.9",
"@types/ember": "^4.0.0",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions test-app/tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import './assertions/dom';
import './assertions/testdouble';
import './assertions/wait-for';

import { setApplication } from '@ember/test-helpers';
import * as QUnit from 'qunit';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';

import Application from 'test-app/app';
import config from 'test-app/config/environment';

setApplication(Application.create(config.APP));

setup(QUnit.assert);

start();

0 comments on commit 43c8e57

Please sign in to comment.