mirror of
https://github.com/zhigang1992/angular.js.git
synced 2026-04-06 22:35:22 +08:00
fix($interpolate): $interpolateProvider.endSymbol() returns startSymbol
I also added missing tests.
This commit is contained in:
@@ -45,7 +45,7 @@ function $InterpolateProvider() {
|
||||
endSymbol = value;
|
||||
return this;
|
||||
} else {
|
||||
return startSymbol;
|
||||
return endSymbol;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -31,18 +31,6 @@ describe('$interpolate', function() {
|
||||
expect($interpolate('Hello {{name}}!')($rootScope)).toEqual('Hello Misko!');
|
||||
}));
|
||||
|
||||
describe('provider', function() {
|
||||
beforeEach(module(function($interpolateProvider) {
|
||||
$interpolateProvider.startSymbol('--');
|
||||
$interpolateProvider.endSymbol('--');
|
||||
}));
|
||||
|
||||
it('should not get confused with same markers', inject(function($interpolate) {
|
||||
expect($interpolate('---').parts).toEqual(['---']);
|
||||
expect($interpolate('----')()).toEqual('');
|
||||
expect($interpolate('--1--')()).toEqual('1');
|
||||
}));
|
||||
});
|
||||
|
||||
describe('parseBindings', function() {
|
||||
it('should Parse Text With No Bindings', inject(function($interpolate) {
|
||||
@@ -110,4 +98,46 @@ describe('$interpolate', function() {
|
||||
expect(parts[2]).toEqual('C\nD"');
|
||||
}));
|
||||
});
|
||||
|
||||
|
||||
describe('startSymbol', function() {
|
||||
|
||||
beforeEach(module(function($interpolateProvider) {
|
||||
expect($interpolateProvider.startSymbol()).toBe('{{');
|
||||
$interpolateProvider.startSymbol('((');
|
||||
}));
|
||||
|
||||
|
||||
it('should expose the startSymbol in config phase', module(function($interpolateProvider) {
|
||||
expect($interpolateProvider.startSymbol()).toBe('((');
|
||||
}));
|
||||
|
||||
|
||||
it('should not get confused by matching start and end symbols', function() {
|
||||
module(function($interpolateProvider) {
|
||||
$interpolateProvider.startSymbol('--');
|
||||
$interpolateProvider.endSymbol('--');
|
||||
});
|
||||
|
||||
inject(function($interpolate) {
|
||||
expect($interpolate('---').parts).toEqual(['---']);
|
||||
expect($interpolate('----')()).toEqual('');
|
||||
expect($interpolate('--1--')()).toEqual('1');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe('endSymbol', function() {
|
||||
|
||||
beforeEach(module(function($interpolateProvider) {
|
||||
expect($interpolateProvider.endSymbol()).toBe('}}');
|
||||
$interpolateProvider.endSymbol('))');
|
||||
}));
|
||||
|
||||
|
||||
it('should expose the endSymbol in config phase', module(function($interpolateProvider) {
|
||||
expect($interpolateProvider.endSymbol()).toBe('))');
|
||||
}));
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user