Skip to content

Commit

Permalink
Changes for ng2 rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenthedev committed May 26, 2016
1 parent 1b0a686 commit a08b339
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 30 deletions.
4 changes: 2 additions & 2 deletions karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ System.config({
}
});

System.import('angular2/core').then(function (testing) {
return System.import('angular2/platform/testing/browser').then(function (providers) {
System.import('@angular/core').then(function (testing) {
return System.import('@angular/platform/testing/browser').then(function (providers) {
testing.setBaseTestProviders(providers.TEST_BROWSER_PLATFORM_PROVIDERS,
providers.TEST_BROWSER_APPLICATION_PROVIDERS);
});
Expand Down
10 changes: 5 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ module.exports = function (config) {
included: true,
watched: true
}, {
pattern: 'node_modules/angular2/bundles/angular2-polyfills.js',
pattern: 'node_modules/@angular/bundles/@angular-polyfills.js',
included: true,
watched: true
}, {
pattern: 'node_modules/rxjs/bundles/Rx.js',
included: true,
watched: true
}, {
pattern: 'node_modules/angular2/bundles/angular2.js',
pattern: 'node_modules/@angular/bundles/@angular.js',
included: true,
watched: true
}, {
pattern: 'node_modules/angular2/bundles/http.dev.js',
pattern: 'node_modules/@angular/bundles/http.dev.js',
included: true,
watched: true
}, {
pattern: 'node_modules/angular2/bundles/router.dev.js',
pattern: 'node_modules/@angular/bundles/router.dev.js',
included: true,
watched: true
}, {
pattern: 'node_modules/angular2/bundles/testing.dev.js',
pattern: 'node_modules/@angular/bundles/testing.dev.js',
included: true,
watched: true
}, {
Expand Down
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng2-data",
"version": "0.1.1",
"version": "0.2.1",
"description": "Convential HTTP client for Model Data in Angular 2",
"repository": {
"type": "git",
Expand All @@ -18,7 +18,7 @@
},
"keywords": [
"angular",
"angular2",
"@angular",
"data",
"orm",
"http"
Expand All @@ -31,12 +31,14 @@
"typings": "./ng2-data.d.ts",
"homepage": "https://github.com/raghunat/ng2-data#readme",
"dependencies": {
"angular2": "2.0.0-beta.9",
"@angular/common": "^2.0.0-rc.1",
"@angular/core": "2.0.0-rc.1",
"@angular/http": "^2.0.0-rc.1",
"es6-promise": "^3.0.2",
"es6-shim": "^0.33.3",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"zone.js": "0.5.15"
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.6"
},
"devDependencies": {
"body-parser": "^1.15.0",
Expand Down
2 changes: 1 addition & 1 deletion src/base.model.spec.js

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

10 changes: 5 additions & 5 deletions src/base.model.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ inject,
injectAsync,

beforeEachProviders
} from 'angular2/testing';
import {provide} from 'angular2/core';
import {HTTP_PROVIDERS, XHRBackend} from 'angular2/http';
import {MockBackend} from 'angular2/http/testing';
import {MockConnection} from 'angular2/http/testing';
} from '@angular/core/testing';
import {provide} from '@angular/core';
import {HTTP_PROVIDERS, XHRBackend} from '@angular/http';
import {MockBackend} from '@angular/http/testing';
import {MockConnection} from '@angular/http/testing';

import {StoreService} from './store.service';
import {BaseModel} from './base.model';
Expand Down
2 changes: 1 addition & 1 deletion src/store.config.spec.js

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

2 changes: 1 addition & 1 deletion src/store.config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
it,
inject,
injectAsync
} from 'angular2/testing';
} from '@angular/core/testing';

import {StoreConfig} from './store.config';

Expand Down
2 changes: 1 addition & 1 deletion src/store.service.js

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

2 changes: 1 addition & 1 deletion src/store.service.spec.js

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

12 changes: 6 additions & 6 deletions src/store.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ inject,
injectAsync,

beforeEachProviders
} from 'angular2/testing';
import {provide} from 'angular2/core';
} from '@angular/core/testing';
import {provide} from '@angular/core';
import {StoreService} from './store.service';
import {StoreConfig} from './store.config';
import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from 'angular2/http';
import {MockBackend} from 'angular2/http/testing';
import {MockConnection} from 'angular2/http/testing';
import {ResponseOptions} from 'angular2/http';
import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from '@angular/http';
import {MockBackend} from '@angular/http/testing';
import {MockConnection} from '@angular/http/testing';
import {ResponseOptions} from '@angular/http';

describe('StoreService Service', () => {

Expand Down
4 changes: 2 additions & 2 deletions src/store.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Injectable} from 'angular2/core';
import {Http, URLSearchParams, RequestOptions, Headers} from 'angular2/http';
import {Injectable} from '@angular/core';
import {Http, URLSearchParams, RequestOptions, Headers} from '@angular/http';
import 'rxjs/Rx';

import {StoreConfig} from './store.config';
Expand Down

0 comments on commit a08b339

Please sign in to comment.