Skip to content

Commit bc94f23

Browse files
committed
Add one line tests for instructor model spec updating
1 parent 07dfa92 commit bc94f23

5 files changed

Lines changed: 16 additions & 21 deletions

File tree

client/spa/js/instructor/editInstructor.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<input class="textfield" id="firstName" value="<%- firstName %>" /><br/>
1414
<input class="textfield" id="lastName" value="<%- lastName %>" /><br/>
1515
<input class="textfield" id="skills" value="<%- skills %>" /><br/>
16-
<button class="save">Save</button>
17-
<button class="cancel">Cancel</button>
16+
<button class="i-save">Save</button>
17+
<button class="i-cancel">Cancel</button>
1818
</form>
1919
</div>
2020
</section>

client/spa/js/instructor/instructor.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<div class="main container">
1515
<h1><%- firstName %> <%- lastName %></h1>
1616
<p><%- skills %></p>
17-
<button class="edit">Edit</button>
18-
<button class="delete">Delete</button>
17+
<button class="i-edit">Edit</button>
18+
<button class="i-delete">Delete</button>
1919
<div id="result"></div>
2020
</div>
2121
</section>

client/spa/js/instructor/instructor.view.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ module.exports = Backbone.View.extend({
1212
template: _.template(template),
1313
editTemplate: _.template(editTemplate),
1414
events: {
15-
'click .delete': 'destroy',
16-
'click .edit': 'edit',
17-
'click .save': 'save',
18-
'click .cancel': 'cancel'
15+
'click .i-delete': 'destroy',
16+
'click .i-edit': 'edit',
17+
'click .i-save': 'save',
18+
'click .i-cancel': 'cancel'
1919
},
2020
initialize: function(){
2121
this.listenTo(this.model, 'destroy', this.remove);

client/spa/js/instructor/spec/instructor.model.spec.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ describe('Instructor model ', function(){
8484
});
8585

8686
it('does not save when firstName and lastName are empty ', function(){
87-
model.set('firstName', null);
88-
model.set('lastName', null);
87+
model.set({firstName:null, lastName:null});
8988
model.save();
9089
expect(model.validationError).toEqual(['firstName cannot be empty',
9190
'lastName cannot be empty']);
9291
});
9392

9493
it('does not save when firstName and skills are empty ', function(){
95-
model.set('firstName', null);
96-
model.set('skills', null);
94+
model.set({firstName:null, skills:null});
9795
model.save();
9896
expect(model.validationError).toEqual(['firstName cannot be empty',
9997
'skills cannot be empty']);
@@ -106,8 +104,7 @@ describe('Instructor model ', function(){
106104
});
107105

108106
it('does not save when lastName and skills are empty ', function(){
109-
model.set('lastName', null);
110-
model.set('skills', null);
107+
model.set({lastName:null, skills:null});
111108
model.save();
112109
expect(model.validationError).toEqual(['lastName cannot be empty',
113110
'skills cannot be empty']);
@@ -120,9 +117,7 @@ describe('Instructor model ', function(){
120117
});
121118

122119
it('does not save when all fields are empty ', function(){
123-
model.set('firstName', null);
124-
model.set('lastName', null);
125-
model.set('skills', null);
120+
model.set({firstName:null, lastName:null, skills:null});
126121
model.save();
127122
expect(model.validationError).toEqual(['firstName cannot be empty',
128123
'lastName cannot be empty',

client/spa/js/instructor/spec/instructor.view.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ describe('Instructor view ', function(){
6969
// call delegate after spyOn
7070
view.delegateEvents();
7171
view.render();
72-
view.$('.edit').trigger('click');
72+
view.$('.i-edit').trigger('click');
7373
});
7474

7575
describe('when the user enters new instructor information ', function(){
7676

7777
describe('when user clicks on the cancel button', function(){
7878

7979
beforeEach(function(){
80-
view.$('.cancel').trigger('click');
80+
view.$('.i-cancel').trigger('click');
8181
});
8282

8383
it('cancels the user input', function(){
@@ -91,7 +91,7 @@ describe('Instructor view ', function(){
9191
view.$('#lastName').val('changed lastName');
9292
view.$('#skills').val('changed skills');
9393

94-
view.$('.save').trigger('click');
94+
view.$('.i-save').trigger('click');
9595
});
9696

9797
it('updates the model', function(){
@@ -120,7 +120,7 @@ describe('Instructor view ', function(){
120120
it('deletes the model', function(){
121121
// Must render for the event to be fired
122122
view.render();
123-
view.$('.delete').trigger('click');
123+
view.$('.i-delete').trigger('click');
124124
expect(view.destroy).toHaveBeenCalled();
125125
expect(model.destroy).toHaveBeenCalled();
126126
}); // end delete model test

0 commit comments

Comments
 (0)