Skip to content

Commit

Permalink
Merge 07f849c into f793b0b
Browse files Browse the repository at this point in the history
  • Loading branch information
xg-wang committed Jan 23, 2020
2 parents f793b0b + 07f849c commit fb90437
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions lib/broccoli/ember-app.js
Expand Up @@ -22,7 +22,6 @@ const concat = require('broccoli-concat');
const BroccoliDebug = require('broccoli-debug');
const ModuleNormalizer = require('broccoli-module-normalizer');
const AmdFunnel = require('broccoli-amd-funnel');
const ConfigReplace = require('broccoli-config-replace');
const mergeTrees = require('./merge-trees');
const WatchedDir = require('broccoli-source').WatchedDir;
const UnwatchedDir = require('broccoli-source').UnwatchedDir;
Expand All @@ -34,16 +33,13 @@ const omitBy = require('ember-cli-lodash-subset').omitBy;
const isNull = require('ember-cli-lodash-subset').isNull;
const Funnel = require('broccoli-funnel');
const logger = require('heimdalljs-logger')('ember-cli:ember-app');
const emberAppUtils = require('../utilities/ember-app-utils');
const addonProcessTree = require('../utilities/addon-process-tree');
const lintAddonsByType = require('../utilities/lint-addons-by-type');
const emberCLIBabelConfigKey = require('../utilities/ember-cli-babel-config-key');
const { isExperimentEnabled } = require('../experiments');
const semver = require('semver');
const DefaultPackager = require('./default-packager');

const configReplacePatterns = emberAppUtils.configReplacePatterns;

let DEFAULT_CONFIG = {
storeConfigInMeta: true,
autoRun: true,
Expand Down Expand Up @@ -968,36 +964,6 @@ class EmberApp {
return this._cachedTemplateTree;
}

/**
Returns the tree for /tests/index.html
@private
@method testIndex
@return {Tree} Tree for /tests/index.html
*/
testIndex() {
let index = new Funnel(this.trees.tests, {
srcDir: '/',
files: ['index.html'],
destDir: '/tests',
annotation: 'Funnel (test index)',
});

let patterns = configReplacePatterns({
addons: this.project.addons,
autoRun: this.options.autoRun,
storeConfigInMeta: this.options.storeConfigInMeta,
isModuleUnification: isExperimentEnabled('MODULE_UNIFICATION') && !!this.trees.src,
});

return new ConfigReplace(index, this._defaultPackager.packageConfig(this.tests), {
configPath: path.join(this.name, 'config', 'environments', 'test.json'),
files: ['tests/index.html'],
env: 'test',
patterns,
});
}

/*
* Gather application and add-ons javascript files and return them in a single
* tree.
Expand Down

0 comments on commit fb90437

Please sign in to comment.