Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-angular",
"version": "0.0.34",
"version": "0.0.35",
"description": "",
"homepage": "http://www.telerik.com",
"bugs": "http://www.telerik.com",
Expand Down
13 changes: 8 additions & 5 deletions src/nativescript-angular/application.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
//Import globals before the zone, so the latter can patch the global functions
import 'globals';

//prevent a crash in zone patches
global.HTMLElement = function() {}
global.document = {};
//prevent a crash in zone patches. pretend we're node.js
global.process = {};
const oldToString = Object.prototype.toString;
Object.prototype.toString = function() {
return "[object process]";
}
import "zone.js/dist/zone.js"
global.HTMLElement = undefined;
global.document = undefined;
Object.prototype.toString = oldToString;
delete global.process;

import 'reflect-metadata';
import './polyfills/array';
Expand Down
3 changes: 1 addition & 2 deletions tests/app/tests/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ export class SimpleApp {
}

describe('bootstrap', () => {
it('SimpleApp bootstrapped', (done) => {
it('SimpleApp bootstrapped', () => {
return bootstrap(SimpleApp).then((componentRef) => {
assert.isTrue(SimpleApp === componentRef.componentType);
done();
});
});
});
3 changes: 2 additions & 1 deletion tests/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = function(config) {
config.set({
//browserNoActivityTimeout: 40000,

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
Expand Down Expand Up @@ -30,7 +31,7 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],
reporters: ['mocha'],


// web server port
Expand Down
1 change: 1 addition & 0 deletions tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"karma-mocha": "^0.2.1",
"karma-nativescript-launcher": "^0.3.1",
"mocha": "^2.4.5",
"karma-mocha-reporter": "^1.2.0",
"nativescript-dev-typescript": "^0.3.1",
"shelljs": "^0.5.3",
"typescript": "1.8.2"
Expand Down