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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
- attach_workspace:
at: .
- run:
name: Run Tests
command: yarn test
name: Run Node Tests
command: yes | yarn nodetest

workflows:
version: 2
Expand Down
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ module.exports = {
// add your custom rules and overrides for node files here
}
)
},
{
files: ["node-tests/**/*.js"],
env: {
browser: false,
node: true,
mocha: true
}
}
]
};
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/node-tests
16 changes: 15 additions & 1 deletion blueprints/ember-circleci/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,28 @@ module.exports = {

locals(options) {
let {
addon,
exam,
project: {
root,
pkg: { name, keywords = [] }
}
},
yarn
} = options;
isAddon = keywords.includes("ember-addon");
if (isAddon && addon !== undefined && addon !== true) {
isAddon = false;
}
if (!isAddon && addon === true) {
isAddon = true;
}
let hasYarn = existsSync(path.join(root, "yarn.lock"));
if (hasYarn && yarn !== undefined && yarn !== true) {
hasYarn = false;
}
if (!hasYarn && yarn === true) {
hasYarn = true;
}
hasExam = exam !== undefined;
return {
name: stringUtil.dasherize(name),
Expand Down
124 changes: 124 additions & 0 deletions node-tests/blueprints/ember-circleci-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
"use strict";

const { readJsonSync, removeSync } = require("fs-extra");
const { join } = require("path");
const {
setupTestHooks,
emberNew,
emberGenerate
} = require("ember-cli-blueprint-test-helpers/helpers");
const { expect, file } = require("ember-cli-blueprint-test-helpers/chai");

const appPath = process.cwd();

function getDevDependencies() {
let pkg = readJsonSync("package.json");
return Object.keys(pkg.devDependencies);
}

describe("Acceptance: ember generate ember-circleci", function() {
setupTestHooks(this);

beforeEach(function() {
removeSync(join(appPath, "testem.js"));
removeSync(join(appPath, ".circleci", "config.yml"));
removeSync(join(appPath, "tests", "test-helper.js"));
removeSync(join(appPath, "config", "ember-try.js"));
});

it("ember-circleci without activate parameters in application", function() {
let args = ["ember-circleci", "--yarn=nope", "--addon=nope"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("npm install");
expect(file("tests/test-helper.js")).to.contain(
'import start from "ember-exam/test-support/start";'
);
expect(file("tests/test-helper.js")).to.contain("start();");
});
});

it("ember-circleci without activate parameters in addon", function() {
let args = ["ember-circleci", "--yarn=nope", "--addon"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("npm install");
expect(file("tests/test-helper.js")).to.contain(
'import start from "ember-exam/test-support/start";'
);
expect(file("tests/test-helper.js")).to.contain("start();");
});
});

it("ember-circleci with --yarn parameter in application", function() {
let args = ["ember-circleci", "--yarn", "--addon=nope"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("yarn install");
});
});

it("ember-circleci with --yarn parameter in addon", function() {
let args = ["ember-circleci", "--yarn", "--addon"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("yarn install");
expect(file("config/ember-try.js")).to.contain("useYarn: true");
});
});

it("ember-circleci with --exam parameter in application", function() {
let args = ["ember-circleci", "--exam", "--addon=nope"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.not.contain("parallelism:");
});
});

it("ember-circleci with --exam parameter in addon", function() {
let args = ["ember-circleci", "--exam", "--addon"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("parallelism: 4");
expect(file("config/ember-try.js")).to.contain(
"command: `ember exam --split=${process.env.CIRCLE_NODE_TOTAL} --partition=${Number(process.env.CIRCLE_NODE_INDEX) + 1} --parallel --load-balance`,"
);
});
});

it("ember-circleci with --exam=bonjour parameter in addon", function() {
let args = ["ember-circleci", "--exam=bonjour", "--addon"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("parallelism: 4");
});
});

it("ember-circleci with --exam=2 parameter in addon", function() {
let args = ["ember-circleci", "--exam=2", "--addon"];
return emberNew()
.then(() => emberGenerate(args))
.then(() => {
expect(file(".circleci/config.yml")).to.contain("parallelism: 2");
});
});

it("adds ember-exam as a dependency", () => {
let args = ["ember-circleci", "--exam", "--addon"];
return emberNew()
.then(() => {
expect(getDevDependencies()).to.not.contain("ember-exam");
})
.then(() => emberGenerate(args))
.then(() => {
expect(getDevDependencies()).to.contain("ember-exam");
});
});
});
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each"
"test:all": "ember try:each",
"nodetest": "mocha node-tests --recursive"
},
"dependencies": {
"ember-cli-babel": "^7.7.3",
Expand All @@ -33,6 +34,7 @@
"@ember/optional-features": "^0.7.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.10.1",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-htmlbars": "^3.0.1",
Expand All @@ -52,8 +54,11 @@
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-node": "^9.0.1",
"fs-extra": "^7.0.1",
"loader.js": "^4.7.0",
"qunit-dom": "^0.8.4"
"mocha": "^5.0.0",
"qunit-dom": "^0.8.4",
"rimraf": "^2.6.3"
},
"engines": {
"node": "8.* || >= 10.*"
Expand Down
Empty file added tests/unit/.gitkeep
Empty file.
7 changes: 0 additions & 7 deletions tests/unit/utils/ember-observer-test.js

This file was deleted.

Loading