screw-unit-server 0.3.0 → 0.5.3

data/core/lib/jquery.fn.js

@@ -10,7 +10,7 @@
       });
       return self;
     }
-  }
+  };
   function define(self, name, fn) {
     self.data(namespacedName(name), fn);
   };
@@ -21,6 +21,7 @@
       if (fn) result = fn.apply(item, args)
       else throw(name + " is not defined");
     });
+    
     return result;
   };
   function namespacedName(name) {

data/core/lib/jquery.print.js

@@ -18,10 +18,14 @@
       var extra = {
         'input': ['type', 'name', 'value'],
         'a': ['href', 'target'],
-        'form': ['method', 'action']
+        'form': ['method', 'action'],
+        'script': ['src'],
+        'link': ['href'],
+        'img': ['src']
       };
-      $.each(properties.concat(extra[obj.tagName.toLowerCase()] || []), function() {
-        if (obj[this]) 
+
+      $.each(properties.concat(extra[obj.tagName.toLowerCase()] || []), function(){
+        if (obj[this])
           result.push(' ' + this.replace('className', 'class') + "=" + $.print(obj[this]))
       });
       return "<" + obj.tagName.toLowerCase()
@@ -30,7 +34,7 @@
   }
 
   function print_object(obj, opts) {
-    var seen = opts.seen || [];
+    var seen = opts.seen || [ obj ];
 
     var result = [], key, value;
     for (var k in obj) {
@@ -45,9 +49,6 @@
     return "{ " + result.join(", ") + " }";
   }
 
-  function print_jquery(obj) {
-  }
-
   function print_string(value, opts) {
     var character_substitutions = {
       '\b': '\\b',
@@ -81,18 +82,18 @@
       return "undefined";
     else if (typeof obj == 'boolean')
       return obj.toString();
-    else if (!obj && typeof obj == 'number')
-      return 'NaN';
+    else if (typeof obj == 'number')
+      return obj.toString();
     else if (!obj)
       return "null";
     else if (typeof obj == 'string')
       return print_string(obj, opts);
     else if (obj instanceof RegExp)
       return obj.toString();
+    else if (obj instanceof Array || obj.callee || obj.item)
+      return print_array(obj, opts);
     else if (typeof obj == 'function' || obj instanceof Function)
       return obj.toString().match(/^([^)]*\))/)[1];
-    else if (obj instanceof Array)
-      return print_array(obj, opts);
     else if (obj.nodeType)
       return print_element(obj);
     else if (obj instanceof jQuery)
@@ -104,5 +105,5 @@
     else
       return obj.toString().replace(/\n\s*/g, '');
   }
-  
+
 })(jQuery);

data/core/lib/screw.behaviors.js

@@ -2,8 +2,9 @@
   $(Screw).bind('loaded', function() {
     $('.status').fn({
       display: function() {
-        $(this).text(
-          $('.passed').length + $('.failed').length + ' test(s), ' + $('.failed').length + ' failure(s)'
+        $(this).html(
+          $('.passed').length + $('.failed').length + ' test(s), ' + $('.failed').length + ' failure(s)<br />' +
+          ((new Date() - Screw.suite_start_time)/1000.0).toString() + " seconds elapsed"
         );
       }
     });
@@ -35,7 +36,7 @@
     });
   
     $('body > .describe').fn({
-      selector: function() { return 'body > .describe' }
+      selector: function() { return 'body > .describe'; }
     });
     
     $('.it').fn({
@@ -62,7 +63,7 @@
         $(Screw)
           .queue(function() {
             self.fn('run');
-            setTimeout(function() { $(Screw).dequeue() }, 0);
+            setTimeout(function() { $(Screw).dequeue(); }, 0);
           });
       },
       
@@ -72,12 +73,13 @@
       }
     });
     
-    $('.before').fn({
-      run: function() { $(this).data('screwunit.run')() }
+    $('body .before').fn({
+      run: function() { $(this).data('screwunit.run')(); }
     }); 
   
-    $('.after').fn({
-      run: function() { $(this).data('screwunit.run')() }
+    $('body .after').fn({
+      run: function() {
+        $(this).data('screwunit.run')(); }
     });
 
     $(Screw).trigger('before');
@@ -87,5 +89,5 @@
       .eq(0).trigger('scroll').end()
       .fn('enqueue');
     $(Screw).queue(function() { $(Screw).trigger('after') });
-  })
+  });
 })(jQuery);

data/core/lib/screw.builder.js

@@ -1,14 +1,28 @@
 var Screw = (function($) {
   var screw = {
     Unit: function(fn) {
-      var contents = fn.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1];
-      var fn = new Function("matchers", "specifications",
+      var wrappedFn;
+      if(fn.length == 0) {
+        var contents = fn.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1];
+        wrappedFn = new Function("matchers", "specifications",
         "with (specifications) { with (matchers) { " + contents + " } }"
-      );
+        );
+      } else {
+        wrappedFn = function(matchers, specifications) {
+          var screwContext = {};
+          for(var method in matchers) {
+            screwContext[method] = matchers[method];
+          }
+          for(var method in specifications) {
+            screwContext[method] = specifications[method];
+          }
+          fn(screwContext);
+        }
+      }
 
       $(Screw).queue(function() {
         Screw.Specifications.context.push($('body > .describe'));
-        fn.call(this, Screw.Matchers, Screw.Specifications);
+        wrappedFn.call(this, Screw.Matchers, Screw.Specifications);
         Screw.Specifications.context.pop();
         $(this).dequeue();
       });
@@ -19,7 +33,7 @@ var Screw = (function($) {
 
       describe: function(name, fn) {
         var describe = $('<li class="describe">')
-          .append($('<h1>').text(name))
+          .append($('<h1 />').text(name))
           .append('<ol class="befores">')
           .append('<ul class="its">')
           .append('<ul class="describes">')
@@ -36,7 +50,7 @@ var Screw = (function($) {
 
       it: function(name, fn) {
         var it = $('<li class="it">')
-          .append($('<h2>').text(name))
+          .append($('<h2 />').text(name))
           .data('screwunit.run', fn);
 
         this.context[this.context.length-1]
@@ -45,7 +59,7 @@ var Screw = (function($) {
       },
 
       before: function(fn) {
-        var before = $('<li class="before">')
+        var before = $('<li class="before"></li>')
           .data('screwunit.run', fn);
 
         this.context[this.context.length-1]
@@ -54,7 +68,7 @@ var Screw = (function($) {
       },
 
       after: function(fn) {
-        var after = $('<li class="after">')
+        var after = $('<li class="after"></li>')
           .data('screwunit.run', fn);
 
         this.context[this.context.length-1]
@@ -65,16 +79,17 @@ var Screw = (function($) {
   };
 
   $(screw).queue(function() { $(screw).trigger('loading') });
-  $(function() {
+  $(window).load(function(){
     $('<div class="describe">')
-      .append('<h3 class="status">')
+      .append('<h3 class="status" />')
       .append('<ol class="befores">')
       .append('<ul class="describes">')
       .append('<ol class="afters">')
       .appendTo('body');
-
+  
     $(screw).dequeue();
     $(screw).trigger('loaded');
   });
+  
   return screw;
 })(jQuery);

data/core/lib/screw.css

@@ -42,7 +42,7 @@ html {
     .describes .describe {
       margin-left: 0.6em;
       padding-left: 0.6em;
-      border: 1px dashed grey;
+      border: 1px dashed #6E6E6E;
     }
 
       .describes .describe .its {}
@@ -87,4 +87,4 @@ html {
             cursor: pointer;
             color: #000 !important;
             border-bottom: 1px solid #9A8E51;
-          }
+          }

data/core/lib/screw.events.js

@@ -27,12 +27,19 @@
           $(this)
             .addClass('failed')
             .append($('<p class="error">').text(reason.toString()));
-        })
+
+          var file = reason.fileName || reason.sourceURL;
+          var line = reason.lineNumber || reason.line;          
+          if (file || line) {
+            $(this).append($('<p class="error"></p>').text('line ' + line + ', ' + file));
+          }
+        });
     })
     .bind('before', function() {
+      Screw.suite_start_time = new Date();
       $('.status').text('Running...');
     })
     .bind('after', function() {
-      $('.status').fn('display')
-    })
-})(jQuery);
+      $('body .status').fn('display');
+    });
+})(jQuery);

data/core/lib/screw.matchers.js

@@ -1,6 +1,21 @@
 Screw.Matchers = (function($) {
   return matchers = {
     expect: function(actual) {
+      var funcname = function(f) {
+          var s = f.toString().match(/function (\w*)/)[1];
+          if ((s == null) || (s.length == 0)) return "anonymous";
+          return s;
+      };
+
+      var stacktrace = function() {
+          var s = "";
+          for(var a = arguments.caller; a != null; a = a.caller) {
+              s += funcname(a.callee) + "\n";
+              if (a.caller == a) break;
+          }
+          return s;
+      };
+
       return {
         to: function(matcher, expected, not) {
           var matched = matcher.match(expected, actual);
@@ -8,35 +23,77 @@ Screw.Matchers = (function($) {
             throw(matcher.failure_message(expected, actual, not));
           }
         },
-        
+
         to_not: function(matcher, expected) {
           this.to(matcher, expected, true);
         }
       }
     },
-    
+
     equal: {
       match: function(expected, actual) {
+        if(expected == actual) return true;
+        if(actual == undefined) return false;
+
         if (expected instanceof Array) {
           for (var i = 0; i < actual.length; i++)
             if (!Screw.Matchers.equal.match(expected[i], actual[i])) return false;
           return actual.length == expected.length;
         } else if (expected instanceof Object) {
           for (var key in expected)
-            if (expected[key] != actual[key]) return false;
+            if (!this.match(expected[key], actual[key])) return false;
           for (var key in actual)
-            if (actual[key] != expected[key]) return false;
+            if (!this.match(actual[key], expected[key])) return false;
           return true;
-        } else {
-          return expected == actual;
         }
+        return false;
       },
-      
+
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not equal ' : ' to equal ') + $.print(expected);
       }
     },
-    
+
+    be_gt: {
+      match: function(expected, actual) {
+        return actual > expected;
+      },
+      
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be greater than ' + $.print(expected);
+      }
+    },
+
+    be_gte: {
+      match: function(expected, actual) {
+        return actual >= expected;
+      },
+      
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be greater than or equal to ' + $.print(expected);
+      }
+    },
+
+    be_lt: {
+      match: function(expected, actual) {
+        return actual < expected;
+      },
+      
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be less than ' + $.print(expected);
+      }
+    },
+
+    be_lte: {
+      match: function(expected, actual) {
+        return actual <= expected;
+      },
+      
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be less than or equal to ' + $.print(expected);
+      }
+    },
+
     match: {
       match: function(expected, actual) {
         if (expected.constructor == RegExp)
@@ -44,22 +101,144 @@ Screw.Matchers = (function($) {
         else
           return actual.indexOf(expected) > -1;
       },
-      
+
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not match ' : ' to match ') + $.print(expected);
       }
     },
-    
+
     be_empty: {
       match: function(expected, actual) {
         if (actual.length == undefined) throw(actual.toString() + " does not respond to length");
-        
+
         return actual.length == 0;
       },
-      
+
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not be empty' : ' to be empty');
       }
+    },
+
+    be_blank: {
+      match: function(expected, actual) {
+        if (actual == undefined) return true;
+        if (typeof(actual) == "string") actual = actual.replace(/^\s*(.*?)\s*$/, "$1");
+        return Screw.Matchers.be_empty.match(expected, actual);
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not be blank' : ' to be blank');
+      }
+    },
+
+    have_length: {
+      match: function(expected, actual) {
+        if (actual.length == undefined) throw(actual.toString() + " does not respond to length");
+
+        return actual.length == expected;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not' : ' to') + ' have length ' + expected;
+      }
+    },
+
+    be_null: {
+      match: function(expected, actual) {
+        return actual == null;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not be null' : ' to be null');
+      }
+    },
+
+    be_undefined: {
+      match: function(expected, actual) {
+        return actual == undefined;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not be undefined' : ' to be undefined');
+      }
+    },
+
+    be_true: {
+      match: function(expected, actual) {
+        return actual;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not be true' : ' to be true');
+      }
+    },
+
+    be_false: {
+      match: function(expected, actual) {
+        return !actual;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not be false' : ' to be false');
+      }
+    },
+
+    match_html: {
+      munge: function(mungee) {
+        if (mungee instanceof jQuery) {
+          mungee = mungee.html();
+        } else if (typeof(mungee) == "string") {
+          var span = document.createElement("span");
+          span.innerHTML = mungee;
+          mungee = span.innerHTML;
+        }
+
+        var regEx = /\sjQuery\d+=['"]\d+['"]/g;
+        mungee = mungee.replace(regEx, "");
+
+        return mungee;
+      },
+
+      match: function(expected, actual) {
+        var trimmedExpected = this.munge(expected);
+        var trimmedActual = this.munge(actual);
+        return trimmedActual.indexOf(trimmedExpected) > -1;
+      },
+
+      failure_message: function(expected, actual, not) {
+        var trimmedExpected = this.munge(expected);
+        var trimmedActual = this.munge(actual);
+        return 'expected ' + $.print(trimmedActual, { max_string: 300 }) +
+               (not ? ' to not contain ' : ' to contain ') + $.print(trimmedExpected, { max_string: 300 });
+      }
+    },
+
+    match_selector: {
+      match: function(expected, actual) {
+        if (!(actual instanceof jQuery)) {
+          throw expected.toString() + " must be an instance of jQuery to match against a selector"
+        }
+
+        return actual.is(expected);
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not match selector ' : ' to match selector ') + expected;
+      }
+    },
+
+    contain_selector: {
+      match: function(expected, actual) {
+        if (!(actual instanceof jQuery)) {
+          throw expected.toString() + " must be an instance of jQuery to match against a selector"
+        }
+
+        return actual.find(expected).length > 0;
+      },
+
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not contain selector ' : ' to contain selector ') + expected;
+      }
     }
   }
-})(jQuery);
+})(jQuery);