Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Some trivial fixes to new e2e harness #9706

Closed
wants to merge 4 commits into from
Closed

Some trivial fixes to new e2e harness #9706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21e72d6
chore(tests): remove redundant file
shahata Oct 20, 2014
c6ffaa7
refactor(tests): remove some duplicate conditions
shahata Oct 20, 2014
73f627f
chore(npm): add cheerio to npm shrinkwrap
shahata Oct 20, 2014
1dc5f3d
chore(npm): updated some packages so shrinkwrap works with [email protected]
shahata Oct 21, 2014
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
88 changes: 77 additions & 11 deletions npm-shrinkwrap.json
View file
Open in desktop

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

23 changes: 0 additions & 23 deletions test/e2e/templates/test.html
View file
Open in desktop

This file was deleted.

42 changes: 19 additions & 23 deletions test/e2e/tools/fixture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,28 @@ function generateFixture(test, query) {
}
});

if (jquery && (!('jquery' in query) || (/^(0|no|false|off|n)$/i).test(query.jquery))) {
$(jquery).remove();
} else if ('jquery' in query) {
if ((/^(0|no|false|off|n)$/i).test(query.jquery)) {
if (jquery) {
$(jquery).remove();
}
} else {
if (!jquery) {
jquery = $.load('<script></script>')('script')[0];
if (firstScript) {
$(firstScript).before(jquery);
if (!('jquery' in query) || (/^(0|no|false|off|n)$/i).test(query.jquery)) {
if (jquery) {
$(jquery).remove();
}
} else {
if (!jquery) {
jquery = $.load('<script></script>')('script')[0];
if (firstScript) {
$(firstScript).before(jquery);
} else {
var head = $$('head');
if (head.length) {
head.prepend(jquery);
} else {
var head = $$('head');
if (head.length) {
head.prepend(jquery);
} else {
$$.root().first().before(jquery);
}
$$.root().first().before(jquery);
}
}
if (!/^\d+\.\d+.*$/.test(query.jquery)) {
$(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
} else {
$(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
}
}
if (!/^\d+\.\d+.*$/.test(query.jquery)) {
$(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
} else {
$(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
}
}

Expand Down