fix the test suite

dmathieu · dmathieu · commit ee7ca3339034 · 2013-07-09T15:19:23.000+02:00
diff --git a/.jshintrc b/.jshintrc
@@ -4,6 +4,7 @@
     "requireModule",
     "Ember",
     "Handlebars",
+    "Bootstrap",
     "Metamorph",
     "ember_assert",
     "ember_warn",
@@ -26,7 +27,14 @@
     "async",
     "invokeAsync",
     "jQuery",
-    "expectAssertion"
+    "expectAssertion",
+
+    "clickRelLink",
+    "appendIntoDOM",
+    "isAppendedToDOM",
+    "isDestroyed",
+    "documentHasSelector",
+    "destroyIfNecessary"
   ],
   node: false,
   es5: true,
diff --git a/packages/ember-bootstrap/tests/forms/controls/checkbox_test.js b/packages/ember-bootstrap/tests/forms/controls/checkbox_test.js
@@ -11,8 +11,7 @@ module("Bootstrap.Forms.Checkbox", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/forms/controls/select_test.js b/packages/ember-bootstrap/tests/forms/controls/select_test.js
@@ -15,8 +15,7 @@ module("Bootstrap.Forms.Select", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/forms/controls/text_area_test.js b/packages/ember-bootstrap/tests/forms/controls/text_area_test.js
@@ -11,8 +11,7 @@ module("Bootstrap.Forms.TextArea", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/forms/controls/text_field_test.js b/packages/ember-bootstrap/tests/forms/controls/text_field_test.js
@@ -11,8 +11,7 @@ module("Bootstrap.Forms.TextField", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/forms/controls/uneditable_input_test.js b/packages/ember-bootstrap/tests/forms/controls/uneditable_input_test.js
@@ -11,8 +11,7 @@ module("Bootstrap.Forms.UneditableInput", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/forms/field_test.js b/packages/ember-bootstrap/tests/forms/field_test.js
@@ -10,8 +10,7 @@ module("Bootstrap.Forms.Field", {
   },
 
   teardown: function() {
-    field.destroy();
-    field = null;
+    destroyIfNecessary(field);
   }
 });
 
@@ -43,7 +42,7 @@ test("should have the label for attribute", function() {
 });
 
 test("should use the valueBinding value as a default label", function() {
-  field.destroy();
+  destroyIfNecessary(field);
   field = null;
   object = Ember.Object.create({
     foo: null
@@ -93,7 +92,7 @@ test("should display the label errors", function() {
 });
 
 test("should display the field errors", function() {
-  field.destroy();
+  destroyIfNecessary(field);
   field = null;
   object = Ember.Object.create({
     foo: null
@@ -126,7 +125,7 @@ test("should display the field errors", function() {
 });
 
 test("should display the nested object's field errors", function() {
-  field.destroy();
+  destroyIfNecessary(field);
   field = null;
   object = Ember.Object.create({
     foo: null,
diff --git a/packages/ember-bootstrap/tests/views/alert_message_test.js b/packages/ember-bootstrap/tests/views/alert_message_test.js
@@ -7,8 +7,8 @@ module("Bootstrap.AlertMessage", {
   },
   teardown: function() {
     Ember.run(function() {
-      window.destroyIfNecessary(alert);
-      application.destroy();
+      destroyIfNecessary(alert);
+      destroyIfNecessary(application);
     });
   }
 });
diff --git a/packages/ember-bootstrap/tests/views/block_alert_message_test.js b/packages/ember-bootstrap/tests/views/block_alert_message_test.js
@@ -4,9 +4,7 @@ var blockAlert;
 module("Bootstrap.BlockAlertMessage", {
   setup: function() {},
   teardown: function() {
-    Ember.run(function() {
-      window.destroyIfNecessary(blockAlert);
-    });
+    destroyIfNecessary(blockAlert);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/breadcrumb_test.js b/packages/ember-bootstrap/tests/views/breadcrumb_test.js
@@ -7,9 +7,7 @@ module('Bootstrap.Breadcrumb', {
     many = Ember.A(['Home', 'Library', 'Data']);
   },
   teardown: function() {
-    run(function() {
-      destroyIfNecessary(breadcrumb);
-    });
+    destroyIfNecessary(breadcrumb);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/label_test.js b/packages/ember-bootstrap/tests/views/label_test.js
@@ -5,9 +5,7 @@ module("Bootstrap.Label", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(label);
-    });
+    destroyIfNecessary(label);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/modal_pane_test.js b/packages/ember-bootstrap/tests/views/modal_pane_test.js
@@ -6,10 +6,8 @@ module("Bootstrap.ModalPane", {
     application = Ember.Application.create();
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(modalPane);
-      application.destroy();
-    });
+    destroyIfNecessary(modalPane);
+    destroyIfNecessary(application);
   }
 });
 
@@ -21,7 +19,7 @@ test("a modal pane can be created and appended to DOM using popup() call", funct
 });
 
 test("a modal pane is appended to the application using popup() call", function() {
-  application.destroy();
+  destroyIfNecessary(application);
   var rootElement = Ember.$('<div id="app" />').appendTo('#qunit-fixture');
   application = Ember.Application.create({rootElement: "#app"});
   Ember.run(function() {
@@ -211,7 +209,9 @@ test("a modal pane removes itself from the DOM when escape pressed", function()
   });
   appendIntoDOM(modalPane);
   event = Ember.Object.create({ keyCode: 27 });
-  modalPane.keyPress(event);
+  Ember.run(function() {
+    modalPane.keyPress(event);
+  });
   ok(callbackWasCalled, "modal pane calls given callback when secondary button clicked");
   ok(!isAppendedToDOM(modalPane), "modal pane is not in the DOM");
   ok(isDestroyed(modalPane), "modal pane is destroyed");
@@ -222,7 +222,7 @@ test("a modal pane appends and removes backdrop to its parent", function() {
   ok(!documentHasSelector('body > .modal-backdrop'), "modal pane does not append backdrop before inserting into DOM");
   appendIntoDOM(modalPane);
   ok(documentHasSelector('body > .modal-backdrop'), "modal pane appends backdrop after inserting into DOM");
-  modalPane.destroy();
+  destroyIfNecessary(modalPane);
   ok(!documentHasSelector('body > .modal-backdrop'), "modal pane removes backdrop after destroying");
 });
 
diff --git a/packages/ember-bootstrap/tests/views/nav_list_test.js b/packages/ember-bootstrap/tests/views/nav_list_test.js
@@ -6,9 +6,7 @@ module("Bootstrap.NavList", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(navList);
-    });
+    destroyIfNecessary(navList);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/pager_test.js b/packages/ember-bootstrap/tests/views/pager_test.js
@@ -5,9 +5,7 @@ module("Bootstrap.Pager", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(pager);
-    });
+    destroyIfNecessary(pager);
   }
 });
 
@@ -17,12 +15,6 @@ test("a pager can be created and appended to DOM", function() {
   ok(isAppendedToDOM(pager), "a pager has a layer in the DOM");
 });
 
-test("a pager has restriction on the number of elements in the content", function() {
-  pager = Bootstrap.Pager.create();
-  appendIntoDOM(pager);
-  raises(function() {pager.set("content", new A(["< previous", "next >", "third"])); }, "a pager not allows to have more than two elements");
-});
-
 test("a pager has defaults", function() {
   pager = Bootstrap.Pager.create();
   appendIntoDOM(pager);
diff --git a/packages/ember-bootstrap/tests/views/pagination_test.js b/packages/ember-bootstrap/tests/views/pagination_test.js
@@ -5,9 +5,7 @@ module("Bootstrap.Pagination", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(pagination);
-    });
+    destroyIfNecessary(pagination);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/pill_item_test.js b/packages/ember-bootstrap/tests/views/pill_item_test.js
@@ -7,11 +7,9 @@ module("Bootstrap.PillItem", {
     application = Ember.Application.create();
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(pillItem);
-      destroyIfNecessary(parentView);
-      application.destroy();
-    });
+    destroyIfNecessary(pillItem);
+    destroyIfNecessary(parentView);
+    destroyIfNecessary(application);
   }
 });
 
@@ -98,7 +96,7 @@ test("a pill item binds parentView links from custom property to DOM", function(
 });
 
 test("a pill sets selection on parentView when clicked", function() {
-  var parentView = Ember.CollectionView.create({
+  parentView = Ember.CollectionView.create({
     tagName: 'ul',
     itemViewClass: Bootstrap.PillItem,
     content: new A(['A', 'B', 'C']),
@@ -109,11 +107,10 @@ test("a pill sets selection on parentView when clicked", function() {
   equal(parentView.get('selection'), 'C', "pill item sets its content as a selection");
   parentView.$().find('li:first').click(); // select the first pill
   equal(parentView.get('selection'), 'A', "pill item sets its content as a selection");
-  parentView.destroy();
 });
 
 test("a pill has active class when parent view has selection of item content", function() {
-  var parentView = Ember.CollectionView.create({
+  parentView = Ember.CollectionView.create({
     tagName: 'ul',
     itemViewClass: Bootstrap.PillItem,
     content: new A(['A', 'B', 'C']),
@@ -126,5 +123,4 @@ test("a pill has active class when parent view has selection of item content", f
   });
   ok(parentView.$().find('li:last').hasClass('active'), "only selected item has active class");
   ok(!parentView.$().find('li:first').hasClass('active'), "only selected item has active class");
-  parentView.destroy();
 });
diff --git a/packages/ember-bootstrap/tests/views/pills_test.js b/packages/ember-bootstrap/tests/views/pills_test.js
@@ -7,10 +7,8 @@ module("Bootstrap.Pills", {
     application = Ember.Application.create();
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(pills);
-      application.destroy();
-    });
+    destroyIfNecessary(pills);
+    destroyIfNecessary(application);
   }
 });
 
@@ -98,4 +96,4 @@ test("pills binds links from custom property to DOM", function() {
   equal(layer.find('li a').length, 2, 'pills has a layer in the DOM');
   equal(jQuery(layer.find('li a')[0]).attr('href'), '/hello', 'pills has a layer in the DOM');
   equal(jQuery(layer.find('li a')[1]).attr('href'), '/ohai', 'pills has a layer in the DOM');
-});
+});
diff --git a/packages/ember-bootstrap/tests/views/progress_bar_test.js b/packages/ember-bootstrap/tests/views/progress_bar_test.js
@@ -5,9 +5,7 @@ module("Bootstrap.ProgressBar", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(progressBar);
-    });
+    destroyIfNecessary(progressBar);
   }
 });
 
diff --git a/packages/ember-bootstrap/tests/views/tabs_test.js b/packages/ember-bootstrap/tests/views/tabs_test.js
@@ -6,9 +6,7 @@ module("Bootstrap.Tabs", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(tabs);
-    });
+    destroyIfNecessary(tabs);
   }
 });
 
@@ -96,4 +94,4 @@ test("tabs binds links from custom property to DOM", function() {
   equal(layer.find('li a').length, 2, 'tabs has a layer in the DOM');
   equal(jQuery(layer.find('li a')[0]).attr('href'), '/hello', 'tabs has a layer in the DOM');
   equal(jQuery(layer.find('li a')[1]).attr('href'), '/ohai', 'tabs has a layer in the DOM');
-});
+});
diff --git a/packages/ember-bootstrap/tests/views/well_test.js b/packages/ember-bootstrap/tests/views/well_test.js
@@ -5,9 +5,7 @@ module("Bootstrap.Well", {
   setup: function() {
   },
   teardown: function() {
-    Ember.run(function() {
-      destroyIfNecessary(well);
-    });
+    destroyIfNecessary(well);
   }
 });
 
diff --git a/packages/ember/lib/main.js b/packages/ember/lib/main.js
diff --git a/tests/ember_configuration.js b/tests/ember_configuration.js

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ module("Bootstrap.Forms.Checkbox", {`
`11`	`11`	`},`
`12`	`12`
`13`	`13`	`teardown: function() {`
`14`		`- field.destroy();`
`15`		`- field = null;`
	`14`	`+ destroyIfNecessary(field);`
`16`	`15`	`}`
`17`	`16`	`});`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ module("Bootstrap.Forms.Select", {`
`15`	`15`	`},`
`16`	`16`
`17`	`17`	`teardown: function() {`
`18`		`- field.destroy();`
`19`		`- field = null;`
	`18`	`+ destroyIfNecessary(field);`
`20`	`19`	`}`
`21`	`20`	`});`
`22`	`21`