Merge branch 'master' into selectTest

Author: acburst

_SpecRunner.html

@@ -32,6 +32,10 @@
 
   <script src="tests/spec/select/selectSpec.js"></script>
 
+  <script src="tests/spec/collapsible/collapsibleSpec.js"></script>
+  
+  <script src="tests/spec/toast/toastSpec.js"></script>
+  
   <script src=".grunt/grunt-contrib-jasmine/reporter.js"></script>
 
 

bin/materialize.css

@@ -5879,16 +5879,12 @@ small {
       bottom: 0%; } }
   @media only screen and (min-width : 601px) and (max-width : 992px) {
     #toast-container {
-      min-width: 30%;
       left: 5%;
-      right: 5%;
       bottom: 7%; } }
   @media only screen and (min-width : 993px) {
     #toast-container {
-      min-width: 8%;
       top: 10%;
-      right: 7%;
-      left: 7%; } }
+      right: 7%; } }
 
 .toast {
   border-radius: 2px;

css/ghpages-materialize.css

@@ -5879,16 +5879,12 @@ small {
       bottom: 0%; } }
   @media only screen and (min-width : 601px) and (max-width : 992px) {
     #toast-container {
-      min-width: 30%;
       left: 5%;
-      right: 5%;
       bottom: 7%; } }
   @media only screen and (min-width : 993px) {
     #toast-container {
-      min-width: 8%;
       top: 10%;
-      right: 7%;
-      left: 7%; } }
+      right: 7%; } }
 
 .toast {
   border-radius: 2px;

package.json

@@ -35,8 +35,7 @@
     "jasmine-jquery": "^2.1.1",
     "jquery": "^2.1.4",
     "node-sass": "^2.1.1",
-    "phantomjs": "^1.9.18",
-    "qunit": "^0.7.6"
+    "phantomjs": "^1.9.18"
   },
   "scripts": {
     "test": "grunt travis --verbose"

sass/components/_toast.scss

@@ -8,16 +8,12 @@
     bottom: 0%;
   }
   @media #{$medium-only} {
-    min-width: 30%;
     left: 5%;
-    right: 5%;
     bottom: 7%;
   }
   @media #{$large-and-up} {
-    min-width: 8%;
     top: 10%;
     right: 7%;
-    left: 7%;
   }
 }
 

tests/spec/collapsible/collapsibleSpec.js

@@ -1,5 +1,6 @@
 jasmine.getFixtures().fixturesPath = 'tests/spec';
 
+
 describe( "Collapsible Plugin", function () {
   var collapsible, accordion;
 

tests/spec/toast/toastSpec.js

@@ -0,0 +1,61 @@
+describe( 'Toasts:', function() {
+  var toastOutDuration = 375;
+  var toastInDuration = 300;
+  var toast;
+
+  describe('Toast javascript functions', function() {
+    // Toast out animation duration does not count as part of its timer.
+    it('should display and remove a toast', function(done) {
+      Materialize.toast('Test toast', toastInDuration);
+
+      setTimeout(function() {
+        toast = $('.toast');
+        expect(toast.length).toBe(1);
+        expect(toast).toBeVisible();
+        expect(toast.text()).toBe('Test toast');
+        setTimeout(function() {
+          toast = $('.toast');
+          expect(toast).toBeVisible();
+          expect(toast.length).toBe(1, 'because toast duration still on going');
+          setTimeout(function() {
+            toast = $('.toast');
+            expect(toast.length).toBe(0, 'because toast should be removed by now');
+            done();
+          }, toastOutDuration + 90); // .1s leeway is given
+        }, 10);
+      }, toastInDuration);
+    });
+
+    it('Opens a toast with HTML content', function() {
+      var $toastContent = $('<span>I am toast content</span>');
+      Materialize.toast($toastContent, 400);
+      toast = $('.toast');
+      expect(toast.first('span').text()).toBe('I am toast content');
+      expect(toast.first('span').text()).not.toBe('I am toast')
+    });
+
+    it('Toasts should call the callback function when dismissed',
+        function(done) {
+      var boolObj = {wasCalled: false};
+      var callback = function() {
+        boolObj.wasCalled = true;
+      };
+      Materialize.toast('I am a toast', 100, '', callback);
+      setTimeout(function() {
+        expect(boolObj.wasCalled).toBe(true,
+            'because the callback set it to true');
+        done();
+      }, 500);
+    });
+
+    it('Apply two custom class to a toast', function() {
+      Materialize.toast('Hi', 400, 'round flat');
+      toast = $('.toast');
+      expect(toast.closest('.round.flat').length).toBe(1,
+          'because the class parameter was passed with two classes');
+    });
+
+  });
+
+
+});