iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(http): rename enums to be singular

Browse Source 
ReadyStates -> ReadyState
RequestMethods -> RequestMethod
ResponseTypes -> ResponseType

Fixes #5574

BREAKING CHANGE:

Before

import {ReadyStates, RequestMethods, ResponseTypes} from 'angular2/http';

After

import {ReadyState, RequestMethod, ResponseType} from 'angular2/http';

Closes #5584
This commit is contained in:
cexbrayat
2015-12-03 22:44:14 +01:00
committed by Cédric Exbrayat
parent 654496b315
commit b925ff5b8d
17 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/angular2/test/http/backends/jsonp_backend_spec.ts
+6 -6
View File
@@ -27,7 +27,7 @@ import {Response} from 'angular2/src/http/static_response';
import {Map} from 'angular2/src/facade/collection';
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
import {ResponseTypes, ReadyStates, RequestMethods} from 'angular2/src/http/enums';
import {ResponseType, ReadyState, RequestMethod} from 'angular2/src/http/enums';
var addEventListenerSpy;
var existingScripts = [];
@@ -94,9 +94,9 @@ export function main() {
it('should use the injected BaseResponseOptions to create the response',
inject([AsyncTestCompleter], async => {
let connection = new JSONPConnection_(sampleRequest, new MockBrowserJsonp(),
new ResponseOptions({type: ResponseTypes.Error}));
new ResponseOptions({type: ResponseType.Error}));
connection.response.subscribe(res => {
expect(res.type).toBe(ResponseTypes.Error);
expect(res.type).toBe(ResponseType.Error);
async.done();
});
connection.finished();
@@ -117,7 +117,7 @@ export function main() {
existingScripts[0].dispatchEvent('load');
TimerWrapper.setTimeout(() => {
expect(connection.readyState).toBe(ReadyStates.Cancelled);
expect(connection.readyState).toBe(ReadyState.Cancelled);
expect(loadSpy).not.toHaveBeenCalled();
expect(errorSpy).not.toHaveBeenCalled();
expect(returnSpy).not.toHaveBeenCalled();
@@ -158,8 +158,8 @@ export function main() {
}));
it('should throw if request method is not GET', () => {
[RequestMethods.Post, RequestMethods.Put, RequestMethods.Delete, RequestMethods.Options,
RequestMethods.Head, RequestMethods.Patch]
[RequestMethod.Post, RequestMethod.Put, RequestMethod.Delete, RequestMethod.Options,
RequestMethod.Head, RequestMethod.Patch]
.forEach(method => {
let base = new BaseRequestOptions();
let req = new Request(
modules/angular2/test/http/backends/mock_backend_spec.ts
+2 -2
View File
@@ -21,7 +21,7 @@ import {Headers} from 'angular2/src/http/headers';
import {Map} from 'angular2/src/facade/collection';
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
import {ResponseTypes} from 'angular2/src/http/enums';
import {ResponseType} from 'angular2/src/http/enums';
export function main() {
describe('MockBackend', () => {
@@ -117,4 +117,4 @@ export function main() {
backend.verifyNoPendingRequests();
});
});
}
}
modules/angular2/test/http/backends/xhr_backend_spec.ts
+7 -7
View File
@@ -21,7 +21,7 @@ import {Headers} from 'angular2/src/http/headers';
import {Map} from 'angular2/src/facade/collection';
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
import {ResponseTypes} from 'angular2/src/http/enums';
import {ResponseType} from 'angular2/src/http/enums';
var abortSpy;
var sendSpy;
@@ -104,9 +104,9 @@ export function main() {
it('should use the injected BaseResponseOptions to create the response',
inject([AsyncTestCompleter], async => {
var connection = new XHRConnection(sampleRequest, new MockBrowserXHR(),
new ResponseOptions({type: ResponseTypes.Error}));
new ResponseOptions({type: ResponseType.Error}));
connection.response.subscribe(res => {
expect(res.type).toBe(ResponseTypes.Error);
expect(res.type).toBe(ResponseType.Error);
async.done();
});
existingXHRs[0].setStatusCode(200);
@@ -115,8 +115,8 @@ export function main() {
it('should complete a request', inject([AsyncTestCompleter], async => {
var connection = new XHRConnection(sampleRequest, new MockBrowserXHR(),
new ResponseOptions({type: ResponseTypes.Error}));
connection.response.subscribe(res => { expect(res.type).toBe(ResponseTypes.Error); },
new ResponseOptions({type: ResponseType.Error}));
connection.response.subscribe(res => { expect(res.type).toBe(ResponseType.Error); },
null, () => { async.done(); });
existingXHRs[0].setStatusCode(200);
existingXHRs[0].dispatchEvent('load');
@@ -131,9 +131,9 @@ export function main() {
it('should create an error Response on error', inject([AsyncTestCompleter], async => {
var connection = new XHRConnection(sampleRequest, new MockBrowserXHR(),
new ResponseOptions({type: ResponseTypes.Error}));
new ResponseOptions({type: ResponseType.Error}));
connection.response.subscribe(null, res => {
expect(res.type).toBe(ResponseTypes.Error);
expect(res.type).toBe(ResponseType.Error);
async.done();
});
existingXHRs[0].dispatchEvent('error');
modules/angular2/test/http/base_request_options_spec.ts
+5 -5
View File
@@ -10,21 +10,21 @@ import {
xit
} from 'angular2/testing_internal';
import {BaseRequestOptions, RequestOptions} from 'angular2/src/http/base_request_options';
import {RequestMethods} from 'angular2/src/http/enums';
import {RequestMethod} from 'angular2/src/http/enums';
export function main() {
describe('BaseRequestOptions', () => {
it('should create a new object when calling merge', () => {
var options1 = new BaseRequestOptions();
var options2 = options1.merge(new RequestOptions({method: RequestMethods.Delete}));
var options2 = options1.merge(new RequestOptions({method: RequestMethod.Delete}));
expect(options2).not.toBe(options1);
expect(options2.method).toBe(RequestMethods.Delete);
expect(options2.method).toBe(RequestMethod.Delete);
});
it('should retain previously merged values when merging again', () => {
var options1 = new BaseRequestOptions();
var options2 = options1.merge(new RequestOptions({method: RequestMethods.Delete}));
expect(options2.method).toBe(RequestMethods.Delete);
var options2 = options1.merge(new RequestOptions({method: RequestMethod.Delete}));
expect(options2.method).toBe(RequestMethod.Delete);
});
});
}
modules/angular2/test/http/http_spec.ts
+14 -14
View File
@@ -16,7 +16,7 @@ import {
BaseRequestOptions,
ConnectionBackend,
Request,
RequestMethods,
RequestMethod,
RequestOptions,
Response,
ResponseOptions,
@@ -143,12 +143,12 @@ export function main() {
inject([AsyncTestCompleter], (async) => {
backend.connections.subscribe(c => {
expect(c.request.url).toBe('https://google.com');
expect(c.request.method).toBe(RequestMethods.Post);
expect(c.request.method).toBe(RequestMethod.Post);
c.mockRespond(new Response(new ResponseOptions({body: 'Thank you'})));
async.done();
});
http.request(new Request(new RequestOptions(
{url: 'https://google.com', method: RequestMethods.Post})))
{url: 'https://google.com', method: RequestMethod.Post})))
.subscribe((res) => {});
}));
@@ -166,10 +166,10 @@ export function main() {
it('should perform a post request for given url if options include a method',
inject([AsyncTestCompleter], (async) => {
backend.connections.subscribe(c => {
expect(c.request.method).toEqual(RequestMethods.Post);
expect(c.request.method).toEqual(RequestMethod.Post);
c.mockRespond(baseResponse);
});
let requestOptions = new RequestOptions({method: RequestMethods.Post});
let requestOptions = new RequestOptions({method: RequestMethod.Post});
http.request('http://basic.connection', requestOptions)
.subscribe(res => {
expect(res.text()).toBe('base response');
@@ -180,10 +180,10 @@ export function main() {
it('should perform a post request for given url if options include a method',
inject([AsyncTestCompleter], (async) => {
backend.connections.subscribe(c => {
expect(c.request.method).toEqual(RequestMethods.Post);
expect(c.request.method).toEqual(RequestMethod.Post);
c.mockRespond(baseResponse);
});
let requestOptions = {method: RequestMethods.Post};
let requestOptions = {method: RequestMethod.Post};
http.request('http://basic.connection', requestOptions)
.subscribe(res => {
expect(res.text()).toBe('base response');
@@ -221,7 +221,7 @@ export function main() {
describe('.get()', () => {
it('should perform a get request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Get);
expect(c.request.method).toBe(RequestMethod.Get);
backend.resolveAllConnections();
async.done();
});
@@ -233,7 +233,7 @@ export function main() {
describe('.post()', () => {
it('should perform a post request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Post);
expect(c.request.method).toBe(RequestMethod.Post);
backend.resolveAllConnections();
async.done();
});
@@ -256,7 +256,7 @@ export function main() {
describe('.put()', () => {
it('should perform a put request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Put);
expect(c.request.method).toBe(RequestMethod.Put);
backend.resolveAllConnections();
async.done();
});
@@ -278,7 +278,7 @@ export function main() {
describe('.delete()', () => {
it('should perform a delete request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Delete);
expect(c.request.method).toBe(RequestMethod.Delete);
backend.resolveAllConnections();
async.done();
});
@@ -290,7 +290,7 @@ export function main() {
describe('.patch()', () => {
it('should perform a patch request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Patch);
expect(c.request.method).toBe(RequestMethod.Patch);
backend.resolveAllConnections();
async.done();
});
@@ -312,7 +312,7 @@ export function main() {
describe('.head()', () => {
it('should perform a head request for given url', inject([AsyncTestCompleter], async => {
backend.connections.subscribe(c => {
expect(c.request.method).toBe(RequestMethods.Head);
expect(c.request.method).toBe(RequestMethod.Head);
backend.resolveAllConnections();
async.done();
});
@@ -363,7 +363,7 @@ export function main() {
inject([AsyncTestCompleter], (async) => {
backend.connections.subscribe(c => {
expect(c.request.method)
.toBe(RequestMethods.Post)
.toBe(RequestMethod.Post)
c.mockRespond(new Response(new ResponseOptions({body: 'Thank you'})));
async.done();
});