cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: corrected left over merge marker

Browse Source
This commit is contained in:
Miško Hevery 2019-02-13 10:50:36 -08:00
parent 7e883c2319
commit 424a3b95aa
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aio/tools/examples/run-example-e2e.js
View File

@ -310,19 +310,11 @@ function getE2eSpecs(basePath, filter) {
// Find all e2e specs in a given example folder. // Find all e2e specs in a given example folder.
function getE2eSpecsFor(basePath, specFile, filter) { function getE2eSpecsFor(basePath, specFile, filter) {
// Only get spec file at the example root. // Only get spec file at the example root.
<<<<<<< HEAD
const e2eSpecGlob = `${filter ? ` * ${filter} * ` : '*'}/${specFile}`;
return globby(e2eSpecGlob, {cwd: basePath, nodir: true})
.then(
paths => paths.filter(file => !IGNORED_EXAMPLES.some(ignored => file.startsWith(ignored)))
.map(file => path.join(basePath, file)));
=======
const e2eSpecGlob = `${filter ? '*' + filter + '*' : '*'}/${specFile}`; const e2eSpecGlob = `${filter ? '*' + filter + '*' : '*'}/${specFile}`;
return globby(e2eSpecGlob, {cwd: basePath, nodir: true}) return globby(e2eSpecGlob, {cwd: basePath, nodir: true})
.then( .then(
paths => paths.filter(file => !IGNORED_EXAMPLES.some(ignored => file.startsWith(ignored))) paths => paths.filter(file => !IGNORED_EXAMPLES.some(ignored => file.startsWith(ignored)))
.map(file => path.join(basePath, file))); .map(file => path.join(basePath, file)));
>>>>>>> c8a0ce7388... test(ivy): enable more docs examples e2e tests (#28688)
} }
// Load configuration for an example. Used for SystemJS // Load configuration for an example. Used for SystemJS