Make tests refactoring

soulex18 · Apr 30, 2015 · efa7efd · efa7efd
1 parent 4dbbee5
commit efa7efd
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -41,7 +41,7 @@
     "jquery": "*"
   },
   "devDependencies": {
-    "qunit": "~1.15.0",
+    "qunit": "~1.18.0",
     "jquery": "jquery#^1.11.1",
     "jquery2": "jquery#^2.1.1",
     "zepto": "~1.1.4"

diff --git a/test/remodal.html b/test/remodal.html
@@ -41,7 +41,9 @@
 </div>
 
 <div class="remodal" data-remodal-id="modal2"
-  data-remodal-options="hashTracking: false,closeOnConfirm:false,closeOnCancel:   false, modifier : with-test-class1 with-test-class2">
+  data-remodal-options="hashTracking: false,
+    closeOnConfirm:false,closeOnCancel:  false, closeOnEscape: false , closeOnAnyClick: false,
+    modifier : with-test-class1 with-test-class2">
 
   <a data-remodal-action="close" class="remodal-close"></a>
   <a data-remodal-action="cancel" class="remodal-cancel" href="#">Cancel</a>

diff --git a/test/remodal_test.js b/test/remodal_test.js
@@ -259,7 +259,7 @@
     });
 
     $document.one('closed', '[data-remodal-id=modal]', function() {
-      assert.ok(!$html.hasClass('remodal-is-locked'), 'page isn\'t locked');
+      assert.notOk($html.hasClass('remodal-is-locked'), 'page isn\'t locked');
       assert.equal(parseInt($body.css('padding-right')), 0, 'padding-right equals 0');
       QUnit.start();
     });
@@ -282,7 +282,7 @@
     });
 
     $document.one('closed', '[data-remodal-id=modal]', function() {
-      assert.ok(!$html.hasClass('remodal-is-locked'), 'page isn\'t locked');
+      assert.notOk($html.hasClass('remodal-is-locked'), 'page isn\'t locked');
       assert.ok(parseInt($body.css('padding-right')) <= 20, 'padding-right is correct');
       QUnit.start();
     });
@@ -297,34 +297,98 @@
       hashTracking: false,
       closeOnConfirm: false,
       closeOnCancel: false,
-      closeOnEscape: true,
-      closeOnAnyClick: true,
+      closeOnEscape: false,
+      closeOnAnyClick: false,
       modifier: 'with-test-class1 with-test-class2'
     }, 'options are correctly parsed');
   });
 
-  QUnit.asyncTest('Options', function(assert) {
+  QUnit.test('"hashTracking" option', function(assert) {
     var $wrapper = $('[data-remodal-id=modal2]').parent();
     var remodal = $wrapper.children().remodal();
 
     remodal.open();
-    assert.ok(!location.hash, 'hash tracking is disabled');
+    assert.notOk(location.hash, 'hash tracking is disabled');
+    remodal.close();
+  });
+
+  QUnit.asyncTest('"closeOnConfirm" option', function(assert) {
+    var $wrapper = $('[data-remodal-id=modal2]').parent();
+    var remodal = $wrapper.children().remodal();
+
+    $document.one('opened', '[data-remodal-id=modal2]', function() {
+      $wrapper.find('[data-remodal-action=confirm]').click();
+    });
 
     $document.one('confirmation', '[data-remodal-id=modal2]', function() {
+      assert.equal(remodal.getState(), 'opened', 'it is still opened');
+      remodal.close();
+    });
+
+    $document.one('closed', '[data-remodal-id=modal2]', function() {
+      QUnit.start();
+    });
+
+    remodal.open();
+  });
+
+  QUnit.asyncTest('"closeOnCancel" option', function(assert) {
+    var $wrapper = $('[data-remodal-id=modal2]').parent();
+    var remodal = $wrapper.children().remodal();
+
+    $document.one('opened', '[data-remodal-id=modal2]', function() {
+      $wrapper.find('[data-remodal-action=cancel]').click();
+    });
+
+    $document.one('cancellation', '[data-remodal-id=modal2]', function() {
+      assert.equal(remodal.getState(), 'opened', 'it is still opened');
+      remodal.close();
+    });
+
+    $document.one('closed', '[data-remodal-id=modal2]', function() {
+      QUnit.start();
+    });
+
+    remodal.open();
+  });
+
+  QUnit.asyncTest('"closeOnEscape" option', function(assert) {
+    var remodal = $('[data-remodal-id=modal2]').remodal();
+
+    $document.one('opened', '[data-remodal-id=modal2]', function() {
+      $document.trigger($.Event('keyup', { keyCode: 27 }));
+
       setTimeout(function() {
-        assert.equal($wrapper.css('display'), 'block', 'wrapper is visible');
+        assert.equal(remodal.getState(), 'opened', 'it is still opened');
+        remodal.close();
       }, 50);
     });
 
-    $document.one('cancellation', '[data-remodal-id=modal2]', function() {
+    $document.one('closed', '[data-remodal-id=modal2]', function() {
+      QUnit.start();
+    });
+
+    remodal.open();
+  });
+
+  QUnit.asyncTest('"closeOnAnyClick" option', function(assert) {
+    var $wrapper = $('[data-remodal-id=modal2]').parent();
+    var remodal = $wrapper.children().remodal();
+
+    $document.one('opened', '[data-remodal-id=modal2]', function() {
+      $wrapper.click();
+
       setTimeout(function() {
-        assert.equal($wrapper.css('display'), 'block', 'wrapper is visible');
-        QUnit.start();
+        assert.equal(remodal.getState(), 'opened', 'it is still opened');
+        remodal.close();
       }, 50);
     });
 
-    $wrapper.find('[data-remodal-action=confirm]').click();
-    $wrapper.find('[data-remodal-action=cancel]').click();
+    $document.one('closed', '[data-remodal-id=modal2]', function() {
+      QUnit.start();
+    });
+
+    remodal.open();
   });
 
   QUnit.asyncTest('"modifier" option', function(assert) {
@@ -342,8 +406,8 @@
     });
 
     $document.one('closed', '[data-remodal-id=modal2]', function() {
-      assert.ok(!$bg.hasClass('with-test-class1 with-test-class2'), 'bg hasn\'t the modifier');
-      assert.ok(!$overlay.hasClass('with-test-class1 with-test-class2'), 'overlay has\'t the modifier');
+      assert.notOk($bg.hasClass('with-test-class1 with-test-class2'), 'bg hasn\'t the modifier');
+      assert.notOk($overlay.hasClass('with-test-class1 with-test-class2'), 'overlay has\'t the modifier');
       assert.ok($modal.hasClass('with-test-class1 with-test-class2'), 'modal still has the modifier');
 
       QUnit.start();