Skip to content
This repository was archived by the owner on Apr 4, 2019. It is now read-only.
Merged
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
12 changes: 6 additions & 6 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ function getPackageTrees(packageName, dependencies) {

// Test Assets

var test = new Funnel('test', {
var test = new Funnel('tests', {
srcDir: '/',
files: [ 'index.html', 'packages-config.js' ],
destDir: '/test'
destDir: '/tests'
});

test = replace(test, {
files: [ 'test/packages-config.js' ],
files: [ 'tests/packages-config.js' ],
pattern: {
match: /\{\{PACKAGES_CONFIG\}\}/g,
replacement: JSON.stringify(packages, null, 2)
Expand All @@ -94,13 +94,13 @@ var loader = new Funnel(bower, {

var qunit = new Funnel(bower, {
srcDir: '/qunit/qunit',
destDir: '/test'
destDir: '/tests'
});

var cliSauce = new Funnel('./node_modules/ember-cli-sauce', {
srcDir: '/vendor',
files: [ 'export-test-results.js' ],
destDir: '/test'
destDir: '/tests'
});

// Export trees
Expand Down Expand Up @@ -156,7 +156,7 @@ for (var packageName in packages.dependencies) {
var transpiledAmdTests = transpileES6(mergeTrees(testTrees), { moduleName: true, type: 'amd' });
var concatenatedAmdTests = concatFiles(transpiledAmdTests, {
inputFiles: ['**/*.js'],
outputFile: '/test/' + packageName + '-tests.amd.js'
outputFile: '/tests/' + packageName + '-tests.amd.js'
});
trees.push(concatenatedAmdTests);

Expand Down
2 changes: 1 addition & 1 deletion bin/run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function runNodeTests(testDir) {
console.log('----');
console.log("Running: Node test runner against "+testPaths.join(", "));
testrunner.run({
code: "test/node-context.js",
code: "tests/node-context.js",
tests: testPaths
}, function(e, summary){
if (e) {
Expand Down
4 changes: 2 additions & 2 deletions testem.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"framework": "qunit",
"test_page": "dist/test/index.html?hidepassed",
"test_page": "dist/tests/index.html?hidepassed",
"before_tests": "ember build",
"watch_files": [
"packages/**/*.js",
"test/**/*.js"
"tests/**/*.js"
],
"launchers":
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.