Skip to content
This repository was archived by the owner on Jun 23, 2025. It is now read-only.

Commit 43df74e

Browse files
committed
feat: support angular 2.0.0-rc.5
Closes #564
1 parent a0ba861 commit 43df74e

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

karma-test-shim.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ System.import('base/karma-systemjs-config.js').then(function() {
2727
var testing = providers[0];
2828
var testingBrowser = providers[1];
2929

30-
testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
31-
testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
30+
testing.TestBed.initTestEnvironment(testingBrowser.BrowserDynamicTestingModule,
31+
testingBrowser.platformBrowserDynamicTesting());
3232
});
3333
}).then(function() {
3434
return Promise.all(

karma.conf.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ module.exports = function(config) {
1313
}
1414
},
1515
files: [
16-
{pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true},
16+
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: true},
1717
{pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true},
18-
//Needed for async testsing {https://github.com/angular/angular/issues/8232}
18+
// Needed for async testsing {https://github.com/angular/angular/issues/8232}
1919
{pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: true},
20-
{pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true},
2120
{pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false },
2221
{pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true},
2322

@@ -38,8 +37,8 @@ module.exports = function(config) {
3837

3938
// paths loaded via Angular's component compiler
4039
// (these paths need to be rewritten, see proxies section)
41-
{pattern: 'dist/**/*.html', included: false, watched: true},
42-
{pattern: 'dist/**/*.css', included: false, watched: true},
40+
// {pattern: 'dist/**/*.html', included: false, watched: true},
41+
// {pattern: 'dist/**/*.css', included: false, watched: true},
4342

4443
// paths to support debugging with source maps in dev tools
4544
{pattern: 'dist/**/*.ts', included: false, watched: false},

package.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
},
2424
"homepage": "https://github.com/SebastianM/angular2-google-maps#readme",
2525
"dependencies": {
26-
"@angular/common": "2.0.0-rc.4",
27-
"@angular/compiler": "2.0.0-rc.4",
28-
"@angular/core": "2.0.0-rc.4",
29-
"@angular/platform-browser": "2.0.0-rc.4",
30-
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
31-
"es6-shim": "^0.35.0",
26+
"@angular/common": "2.0.0-rc.5",
27+
"@angular/compiler": "2.0.0-rc.5",
28+
"@angular/core": "2.0.0-rc.5",
29+
"@angular/http": "2.0.0-rc.5",
30+
"@angular/platform-browser": "2.0.0-rc.5",
31+
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
32+
"core-js": "^2.4.0",
3233
"reflect-metadata": "^0.1.3",
3334
"rxjs": "5.0.0-beta.6",
3435
"zone.js": "^0.6.12"
@@ -72,12 +73,13 @@
7273
"jspm": {
7374
"jspmNodeConversion": false,
7475
"dependencies": {
75-
"@angular/common": "2.0.0-rc.4",
76-
"@angular/compiler": "2.0.0-rc.4",
77-
"@angular/core": "2.0.0-rc.4",
78-
"@angular/platform-browser": "2.0.0-rc.4",
79-
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
80-
"es6-shim": "^0.35.0",
76+
"@angular/common": "2.0.0-rc.5",
77+
"@angular/compiler": "2.0.0-rc.5",
78+
"@angular/core": "2.0.0-rc.5",
79+
"@angular/http": "2.0.0-rc.5",
80+
"@angular/platform-browser": "2.0.0-rc.5",
81+
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
82+
"core-js": "^2.4.0",
8183
"reflect-metadata": "^0.1.3",
8284
"rxjs": "5.0.0-beta.6",
8385
"zone.js": "^0.6.12"

test/services/managers/marker-manager.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {NgZone} from '@angular/core';
2-
import {addProviders, async, describe, inject, it} from '@angular/core/testing';
2+
import {addProviders, async, inject} from '@angular/core/testing';
33

44
import {SebmGoogleMapMarker} from '../../../src/core/directives/google-map-marker';
55
import {GoogleMapsAPIWrapper} from '../../../src/core/services/google-maps-api-wrapper';

test/services/maps-api-loader/lazy-maps-api-loader.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {addProviders, describe, inject, it} from '@angular/core/testing';
1+
import {addProviders, inject} from '@angular/core/testing';
22

33
import {LazyMapsAPILoader} from '../../../src/core/services/maps-api-loader/lazy-maps-api-loader';
44
import {MapsAPILoader} from '../../../src/core/services/maps-api-loader/maps-api-loader';

typings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"name": "angular2-google-maps",
33
"globalDevDependencies": {
4-
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
5-
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4"
4+
"jasmine": "registry:dt/jasmine#2.2.0+20160505161446"
5+
},
6+
"globalDependencies": {
7+
"core-js": "registry:dt/core-js#0.0.0+20160317120654"
68
}
79
}

0 commit comments

Comments
 (0)