kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-01-12 22:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tests): remove some duplicate conditions

Browse Source 
Closes #9706
This commit is contained in:
Shahar Talmi
2014-10-21 01:02:10 +03:00
committed by Caitlin Potter
parent 42f7c80bb6
commit 4d12812bb4
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/e2e/tools/fixture.js
View File

@@ -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');
}
}