Skip to content

Commit

Permalink
Converted some tabs to spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
thedersen committed Jan 20, 2012
1 parent e9f7bea commit 7d169ce
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 49 deletions.
28 changes: 14 additions & 14 deletions buster.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ var config = exports;
config['Default'] = { config['Default'] = {
environment: 'browser', environment: 'browser',
sources: [ sources: [
'lib/jquery-1.6.2.js', 'lib/jquery-1.6.2.js',
'lib/underscore.js', 'lib/underscore.js',
'lib/backbone.js', 'lib/backbone.js',
'lib/backbone.modelbinding.js', 'lib/backbone.modelbinding.js',
'tests/support/default.js', 'tests/support/default.js',
'backbone.validation.js' 'backbone.validation.js'
], ],
tests: [ tests: [
'tests/**/*.js' 'tests/**/*.js'
] ]
}; };


// config['NoConflict'] = { // config['NoConflict'] = {
// environment: 'browser', // environment: 'browser',
// sources: [ // sources: [
// 'lib/jquery-1.6.2.js', // 'lib/jquery-1.6.2.js',
// 'lib/underscore.js', // 'lib/underscore.js',
// 'lib/backbone.js', // 'lib/backbone.js',
// 'lib/backbone.modelbinding.js', // 'lib/backbone.modelbinding.js',
// 'tests/support/noConflict.js', // 'tests/support/noConflict.js',
// 'backbone.validation.js' // 'backbone.validation.js'
// ], // ],
// tests: [ // tests: [
Expand Down
12 changes: 6 additions & 6 deletions tests/customCallbacks.js
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,8 @@
buster.testCase("Overriding default callbacks in Backbone.Validation", { buster.testCase("Overriding default callbacks in Backbone.Validation", {
setUp: function() { setUp: function() {
this.originalCallbacks = {}; this.originalCallbacks = {};
_.extend(this.originalCallbacks, Backbone.Validation.callbacks); _.extend(this.originalCallbacks, Backbone.Validation.callbacks);
this.valid = this.spy(); this.valid = this.spy();
this.invalid = this.spy(); this.invalid = this.spy();


Expand All @@ -28,9 +28,9 @@ buster.testCase("Overriding default callbacks in Backbone.Validation", {
})); }));
}, },


tearDown: function(){ tearDown: function(){
_.extend(Backbone.Validation.callbacks, this.originalCallbacks); _.extend(Backbone.Validation.callbacks, this.originalCallbacks);
}, },


"should call overridden valid callback": function() { "should call overridden valid callback": function() {
this.model.set({ this.model.set({
Expand Down
10 changes: 5 additions & 5 deletions tests/customPatterns.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ buster.testCase('Extending Backbone.Validation with custom pattern', {


buster.testCase('Overriding builtin pattern in Backbone.Validation', { buster.testCase('Overriding builtin pattern in Backbone.Validation', {
setUp: function() { setUp: function() {
this.builtinEmail = Backbone.Validation.patterns.email; this.builtinEmail = Backbone.Validation.patterns.email;
_.extend(Backbone.Validation.patterns, { _.extend(Backbone.Validation.patterns, {
email: /^test/ email: /^test/
}); });
Expand All @@ -50,9 +50,9 @@ buster.testCase('Overriding builtin pattern in Backbone.Validation', {
})); }));
}, },


tearDown: function(){ tearDown: function(){
Backbone.Validation.patterns.email = this.builtinEmail; Backbone.Validation.patterns.email = this.builtinEmail;
}, },


"should execute the custom pattern validator": function() { "should execute the custom pattern validator": function() {
assert(this.model.set({ assert(this.model.set({
Expand Down
12 changes: 6 additions & 6 deletions tests/customValidators.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ buster.testCase('Extending Backbone.Validation with custom validator', {


buster.testCase('Overriding builtin validator in Backbone.Validation', { buster.testCase('Overriding builtin validator in Backbone.Validation', {
setUp: function() { setUp: function() {
this.builtinMin = Backbone.Validation.validators.min; this.builtinMin = Backbone.Validation.validators.min;
_.extend(Backbone.Validation.validators, { _.extend(Backbone.Validation.validators, {
min: function(value, attr, customValue) { min: function(value, attr, customValue) {
if (value !== customValue) { if (value !== customValue) {
Expand All @@ -58,10 +58,10 @@ buster.testCase('Overriding builtin validator in Backbone.Validation', {
})); }));
}, },


tearDown: function(){ tearDown: function(){
Backbone.Validation.validators.min = this.builtinMin; Backbone.Validation.validators.min = this.builtinMin;
}, },
"should execute the overridden validator": function() { "should execute the overridden validator": function() {
assert(this.model.set({ assert(this.model.set({
age: 1 age: 1
Expand Down
6 changes: 3 additions & 3 deletions tests/events.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ buster.testCase("Backbone.Validation events", {
age: 1, age: 1,
name: 'name' name: 'name'
}); });
} }
}, },


"when one invalid value is set": { "when one invalid value is set": {
Expand Down Expand Up @@ -95,7 +95,7 @@ buster.testCase("Backbone.Validation events", {
}, this); }, this);


this.model.set({age:0}); this.model.set({age:0});
} }
}, },


"when two invalid values is set": { "when two invalid values is set": {
Expand Down Expand Up @@ -136,6 +136,6 @@ buster.testCase("Backbone.Validation events", {
age: 0, age: 0,
name: '' name: ''
}); });
} }
} }
}); });
30 changes: 15 additions & 15 deletions tests/validators/patterns.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ buster.testCase("Backbone.Validation patterns", {
}, },


"email pattern matches all valid email addresses": function() { "email pattern matches all valid email addresses": function() {
this.pattern = Backbone.Validation.patterns.email; this.pattern = Backbone.Validation.patterns.email;
this.valid('name@example.com'); this.valid('name@example.com');
this.valid('name@example.com'); this.valid('name@example.com');
this.valid('name+@example.co'); this.valid('name+@example.co');
this.valid('n@e.co'); this.valid('n@e.co');
this.valid('first.last@backbone.example.com'); this.valid('first.last@backbone.example.com');
this.invalid('name'); this.invalid('name');
this.invalid('name@'); this.invalid('name@');
this.invalid('name@example'); this.invalid('name@example');
this.invalid('name.@example.c'); this.invalid('name.@example.c');
this.invalid('name,@example.c'); this.invalid('name,@example.c');
this.invalid('name;@example.c'); this.invalid('name;@example.c');
this.invalid('name@example.com.'); this.invalid('name@example.com.');
}, },


"url pattern matches all valid urls": function() { "url pattern matches all valid urls": function() {
Expand Down

0 comments on commit 7d169ce

Please sign in to comment.