Skip to content

fix: fix Qunit tests by avoiding css files evaluation #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2019
Merged

fix: fix Qunit tests by avoiding css files evaluation #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions main-view-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ export class TestBrokerViewModel extends observable.Observable {
method: 'GET',
timeout: 3000,
}).then(() => {
console.log('NSUTR: found karma at ' + ip);
if (!foundKarma) {
foundKarma = true;
resolve(ip);
}
}, () => undefined)
console.log('NSUTR: found karma at ' + ip);
if (!foundKarma) {
foundKarma = true;
resolve(ip);
}
}, () => undefined)
});
Promise.all(resolvers)
.then(() => {
Expand Down Expand Up @@ -231,7 +231,7 @@ export class TestBrokerViewModel extends observable.Observable {
return Promise.all(scriptUrls.map((url): Promise<IScriptInfo> => {
var appPrefix = `/base/${config.options.appDirectoryRelativePath}/`;
if (url.startsWith(appPrefix)) {
var paramsStart = url.indexOf('?');
var paramsStart = url.lastIndexOf('?');
var relativePath = url.substring(appPrefix.length, paramsStart);
return Promise.resolve({
url: url,
Expand Down Expand Up @@ -260,12 +260,21 @@ export class TestBrokerViewModel extends observable.Observable {
console.log('NSUTR: require script ' + script.url + ' from ' + script.localPath);
require(script.localPath);
} else {
console.log('NSUTR: eval script ' + script.url);
this.loadShim(script.url);
//call eval indirectly to execute the scripts in the global scope
var geval = eval;
geval(script.contents);
this.completeLoading(script.url);
const queryStringStart = script.url.lastIndexOf('?');
const pathWithoutQueryString = script.url.substring(0, queryStringStart);
const extensionRegex = /\.([^.\/]+)$/;
const fileExtension = extensionRegex.exec(pathWithoutQueryString)[1];

if (!fileExtension || fileExtension.toLowerCase() === "js") {
console.log('NSUTR: eval script ' + script.url);
this.loadShim(script.url);
// call eval indirectly to execute the scripts in the global scope
var geval = eval;
geval(script.contents);
this.completeLoading(script.url);
} else {
console.log('NSUTR: ignoring evaluation of script ' + script.url)
}
}
} catch (err) {
this.error(err.toString(), script.localPath || script.url, err.lineNumber || 0);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-unit-test-runner",
"version": "0.5.0",
"version": "0.5.1",
"description": "NativeScript unit test runner component.",
"main": "app.js",
"scripts": {
Expand Down