Add first tests and some other stuff

Rafael J. Staib · Rafael J. Staib · commit 15186bde2eb4 · 2013-05-15T11:46:04.000+02:00
- Tests added
- Using as of now getValidEnumMethod
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -129,6 +129,6 @@ module.exports = function (grunt)
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-contrib-clean');
 
-    grunt.registerTask('default', ['clean', 'jshint'/*, 'qunit'*/]);
+    grunt.registerTask('default', ['clean', 'jshint', 'qunit']);
     grunt.registerTask('release', ['default', 'yuidoc', 'concat', 'uglify', 'compress']);
 };
diff --git a/jquery.steps.js b/jquery.steps.js
@@ -575,7 +575,7 @@
             loadAsyncContent(wizard);
 
             var stepContents = $(".content > .body", wizard);
-            switch (options.transitionEffect)
+            switch (getValidEnumValue($.fn.steps.transitionEffect, options.transitionEffect))
             {
                 case $.fn.steps.transitionEffect.fade:
                     state.transitionShowElement = stepContents.eq(index);
@@ -755,7 +755,7 @@
         if (!options.enableContentCache || !state.currentStep.contentLoaded)
         {
             var currentStepContent;
-            switch (state.currentStep.contentMode)
+            switch (getValidEnumValue($.fn.steps.contentMode, state.currentStep.contentMode))
             {
                 case $.fn.steps.contentMode.iframe:
                     currentStepContent = $(".content > .body", wizard).eq(state.currentIndex);
@@ -902,8 +902,9 @@
         var options = wizard.data("options");
         var $header = $(".content > .title:eq(" + index + ")", wizard);
         var $content = $header.next(".body");
-        var mode = (isNaN($content.data("mode")) || Number($content.data("mode")) > 2) ?
-            $.fn.steps.contentMode.html : Number($content.data("mode"));
+        var mode = ($content.data("mode") == null) ? $.fn.steps.contentMode.html :
+            getValidEnumValue($.fn.steps.contentMode, (/^\s*$/.test($content.data("mode")) || isNaN($content.data("mode"))) ? 
+                $content.data("mode") : Number($content.data("mode")));
         var contentUrl = (mode === $.fn.steps.contentMode.html || $content.data("url") === undefined) ?
             "" : $content.data("url");
         var contentLoaded = (mode !== $.fn.steps.contentMode.html && $content.data("loaded") === "1");
diff --git a/test/index.html b/test/index.html
@@ -2,13 +2,50 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>QUnit Example</title>
-        <link rel="stylesheet" href="qunit/qunit.css">
+        <title>jQuery Steps Test Suite</title>
+        <link rel="stylesheet" href="qunit/qunit-1.11.0.css">
     </head>
     <body>
         <div id="qunit"></div>
-        <div id="qunit-fixture"></div>
-        <script src="qunit/qunit.js"></script>
+        <div id="qunit-fixture">
+            <div id="contentModeWithEmptyStringArgument">
+                <h1>contentModeWithEmptyStringArgument</h1>
+                <div data-mode="">
+                    <p>contentModeWithEmptyStringArgument</p>
+                </div>
+            </div>
+
+            <div id="contentModeWithWrongNumberArgument">
+                <h1>contentModeWithWrongNumberArgument</h1>
+                <div data-mode="3">
+                    <p>contentModeWithWrongNumberArgument</p>
+                </div>
+            </div>
+
+            <div id="contentModeWithWrongStringArgument">
+                <h1>contentModeWithWrongStringArgument</h1>
+                <div data-mode="none">
+                    <p>contentModeWithWrongStringArgument</p>
+                </div>
+            </div>
+
+            <div id="contentModeWithNumberArgument">
+                <h1>contentModeWithNumberArgument</h1>
+                <div data-mode="0">
+                    <p>contentModeWithNumberArgument</p>
+                </div>
+            </div>
+
+            <div id="contentModeWithStringArgument">
+                <h1>contentModeWithStringArgument</h1>
+                <div data-mode="html">
+                    <p>contentModeWithStringArgument</p>
+                </div>
+            </div>
+        </div>
+        <script src="qunit/qunit-1.11.0.js"></script>
         <script src="tests.js"></script>
+        <script src="../lib/jquery-1.9.1.min.js"></script>
+        <script src="../jquery.steps.js"></script>
     </body>
 </html>
diff --git a/test/tests.js b/test/tests.js
@@ -0,0 +1,15 @@
+module("general");
+
+test("contentMode", 5, function ()
+{
+    /*jshint -W024 */
+    throws(function() { $("#contentModeWithEmptyStringArgument").steps(); }, /The enum key/, "Empty string argument");
+    throws(function() { $("#contentModeWithWrongNumberArgument").steps(); }, /Invalid enum value/, "Invalid number argument");
+    throws(function() { $("#contentModeWithWrongStringArgument").steps(); }, /The enum key/, "Invalid string argument");
+
+    var contentModeWithNumberArgument = $("#contentModeWithNumberArgument").steps();
+    equal(contentModeWithNumberArgument.steps("getCurrentStep").contentMode, 0, "Valid number argument");
+
+    var contentModeWithStringArgument = $("#contentModeWithStringArgument").steps();
+    equal(contentModeWithStringArgument.steps("getCurrentStep").contentMode, 0, "Valid string argument");
+});
