Skip to content

Commit fb723c0

Browse files
Merge pull request #25 from NativeScript/vladimirov/migrate-deprecated-code
chore: migrate deprecated code
2 parents 7ba5fd4 + 1822a53 commit fb723c0

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

app-root.xml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Frame defaultPage="./tns_modules/nativescript-unit-test-runner/main-page">
2+
</Frame>

app.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import * as application from "application";
2-
application.cssFile = "./tns_modules/nativescript-unit-test-runner/app.css";
3-
application.start({ moduleName: "./tns_modules/nativescript-unit-test-runner/main-page" });
1+
import * as application from "tns-core-modules/application";
2+
application.setCssFileName("./tns_modules/nativescript-unit-test-runner/app.css");
3+
application.run({ moduleName: "./tns_modules/nativescript-unit-test-runner/app-root" });

main-view-model.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/// <reference path="declarations.d.ts"/>
2-
import observable = require("data/observable");
3-
import observableArray = require('data/observable-array');
4-
import http = require('http');
5-
import platform = require('platform');
6-
import frameModule = require('ui/frame');
2+
import observable = require('tns-core-modules/data/observable');
3+
import observableArray = require('tns-core-modules/data/observable-array');
4+
import http = require('tns-core-modules/http');
5+
import platform = require('tns-core-modules/platform');
6+
import frameModule = require('tns-core-modules/ui/frame');
77
import stopProcess = require('./stop-process');
88

9+
declare var global: any;
10+
911
interface IHostConfiguration {
1012
port: number;
1113
ips: string[];
@@ -153,7 +155,7 @@ export class TestBrokerViewModel extends observable.Observable {
153155
});
154156

155157
function formatName() {
156-
return `NativeScript / ${ platform.device.sdkVersion } (${ platform.device.osVersion }; ${ platform.device.model })`;
158+
return `NativeScript / ${platform.device.sdkVersion} (${platform.device.osVersion}; ${platform.device.model})`;
157159
}
158160

159161
var connected = this.updateBanner('connected');
@@ -361,7 +363,7 @@ export class TestBrokerViewModel extends observable.Observable {
361363
}
362364
} else if (url.indexOf('chai') !== -1) {
363365
global.__shim_require = global.require;
364-
global.require = function() {
366+
global.require = function () {
365367
throw Error();
366368
}
367369
global.window = global;

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"grunt-contrib-watch": "^0.6.1",
2121
"grunt-shell": "^1.1.2",
2222
"grunt-ts": "^5.0.1",
23+
"tns-core-modules": "^4.2.1",
2324
"typescript": "^1.8.2"
2425
},
2526
"nativescript": {

0 commit comments

Comments
 (0)