screw-unit 0.3.3 → 0.5.1

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/screw.behaviors.js

@@ -36,7 +36,7 @@
     });
   
     $('body > .describe').fn({
-      selector: function() { return 'body > .describe' }
+      selector: function() { return 'body > .describe'; }
     });
     
     $('.it').fn({
@@ -63,7 +63,7 @@
         $(Screw)
           .queue(function() {
             self.fn('run');
-            setTimeout(function() { $(Screw).dequeue() }, 0);
+            setTimeout(function() { $(Screw).dequeue(); }, 0);
           });
       },
       
@@ -73,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');
@@ -88,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();
       });
@@ -18,12 +32,12 @@ var Screw = (function($) {
       context: [],
 
       describe: function(name, fn) {
-        var describe = $('<li class="describe"></li>')
-          .append($('<h1></h1>').text(name))
-          .append('<ol class="befores"></ol>')
-          .append('<ul class="its"></ul>')
-          .append('<ul class="describes"></ul>')
-          .append('<ol class="afters"></ol>');
+        var describe = $('<li class="describe">')
+          .append($('<h1 />').text(name))
+          .append('<ol class="befores">')
+          .append('<ul class="its">')
+          .append('<ul class="describes">')
+          .append('<ol class="afters">');
 
         this.context.push(describe);
         fn.call();
@@ -35,8 +49,8 @@ var Screw = (function($) {
       },
 
       it: function(name, fn) {
-        var it = $('<li class="it"></li>')
-          .append($('<h2></h2>').text(name))
+        var it = $('<li class="it">')
+          .append($('<h2 />').text(name))
           .data('screwunit.run', fn);
 
         this.context[this.context.length-1]
@@ -65,16 +79,17 @@ var Screw = (function($) {
   };
 
   $(screw).queue(function() { $(screw).trigger('loading') });
-  $(function() {
-    $('<div class="describe"></div>')
-      .append('<h3 class="status"></h3>')
-      .append('<ol class="befores"></ol>')
-      .append('<ul class="describes"></ul>')
-      .append('<ol class="afters"></ol>')
+  $(window).load(function(){
+    $('<div class="describe">')
+      .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 #999;
+      border: 1px dashed #6E6E6E;
     }
 
       .describes .describe .its {}

data/core/lib/screw.events.js

@@ -26,20 +26,20 @@
         .bind('failed', function(e, reason) {
           $(this)
             .addClass('failed')
-            .append($('<p class="error"></p>').text(reason.toString()));
+            .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);
@@ -38,7 +53,7 @@ Screw.Matchers = (function($) {
         return 'expected ' + $.print(actual) + (not ? ' to not equal ' : ' to equal ') + $.print(expected);
       }
     },
-    
+
     be_gt: {
       match: function(expected, actual) {
         return actual > expected;
@@ -104,6 +119,18 @@ Screw.Matchers = (function($) {
       }
     },
 
+    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");
@@ -156,6 +183,36 @@ Screw.Matchers = (function($) {
       }
     },
 
+    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)) {
@@ -184,4 +241,4 @@ Screw.Matchers = (function($) {
       }
     }
   }
-})(jQuery);
+})(jQuery);

data/core/spec/suite.html

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script src="../lib/jquery-1.2.6.js"></script>
+    <script src="../lib/jquery-1.3.2.js"></script>
     <script src="../lib/jquery.fn.js"></script>
     <script src="../lib/jquery.print.js"></script>
     <script src="../lib/screw.builder.js"></script>
@@ -11,6 +11,7 @@
     <script src="behaviors_spec.js"></script>
     <script src="matchers_spec.js"></script>
     <script src="print_spec.js"></script>
+    <script src="with_screw_context_spec.js"></script>
 
     <link rel="stylesheet" href="../lib/screw.css">
   </head>

data/core/spec/with_screw_context_spec.js

@@ -0,0 +1,9 @@
+Screw.Unit(function(screw) { with(screw) {
+  describe("Screw.Unit", function() {
+    describe("when the passed-in function has an arity of 1", function() {
+      it("passes the Screw.Unit context into the function", function() {
+        expect(true).to(equal, true);
+      });
+    });
+  });
+}});

data/lib/screw_unit.rb

@@ -3,24 +3,21 @@ require "rubygems"
 dir = File.dirname(__FILE__)
 $:.unshift(File.expand_path("#{dir}/../vendor/js-test-core/lib"))
 require "js_test_core"
-JsTestCore::Resources::WebRoot.dispatch_specs
 
-require "#{dir}/screw_unit/resources"
+require "#{dir}/screw_unit/representations"
 
-module ScrewUnit
-  DEFAULT_HOST = JsTestCore::DEFAULT_HOST
-  DEFAULT_PORT = JsTestCore::DEFAULT_PORT
-
-  Server = JsTestCore::Server
-  RailsServer = JsTestCore::RailsServer
-  Client = JsTestCore::Client
-end
 JsTestCore.core_path = File.expand_path("#{dir}/../core/lib")
+JsTestCore::Resources::SpecFile.spec_representation_class = ScrewUnit::Representations::Spec
+module ScrewUnit
+  include JsTestCore
 
-class JsTestCore::Resources::Specs::SpecFile
-  include ScrewUnit::Resources::Spec
-end
-
-class JsTestCore::Resources::Specs::SpecDir
-  include ScrewUnit::Resources::Spec
+  class << self
+    def method_missing(method_name, *args, &block)
+      if JsTestCore::Configuration.instance.respond_to?(method_name)
+        JsTestCore::Configuration.instance.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
+  end
 end

data/lib/screw_unit/representations.rb

@@ -0,0 +1,2 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/representations/spec.html"

data/lib/screw_unit/{resources/spec.rb → representations/spec.html.rb}

@@ -1,22 +1,13 @@
 module ScrewUnit
-  module Resources
-    module Spec
-      def get
-        # TODO: BT/JN - Remove the Screw.Assets when we implement rendering of script and link tags from yml files.
-        html = <<-HTML
-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-        <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-        <title>ScrewUnit results</title>
-        <script src="/core/jquery-1.2.6.js"></script>
-        <script src="/core/jquery.fn.js"></script>
-        <script src="/core/jquery.print.js"></script>
-        <script src="/core/screw.builder.js"></script>
-        <script src="/core/screw.matchers.js"></script>
-        <script src="/core/screw.events.js"></script>
-        <script src="/core/screw.behaviors.js"></script>
-        <script type="text/javascript">
+  module Representations
+    class Spec < JsTestCore::Representations::Spec
+      def title_text
+        "Screw Unit suite"
+      end
+
+      def head_content
+        core_js_files
+        script(raw(<<-JS), :type => "text/javascript")
           (function($) {
             Screw.Assets = {};
             Screw.Assets.use_cache_buster = false; // TODO: NS/CTI - make this configurable from the UI.
@@ -68,34 +59,59 @@ module ScrewUnit
           (function($) {
             var ajax = $.ajax;
             $(Screw).bind('after', function() {
-              var error_text = $(".error").map(function(i, element) {
-                return element.innerHTML;
+              var error_text = $(".error").map(function(i, error_element) {
+                var element = $(error_element);
+
+                var parent_descriptions = element.parents("li.describe");
+                var parent_description_text = [];
+
+                for(var i=parent_descriptions.length-1; i >= 0; i--) {
+                  parent_description_text.push($(parent_descriptions[i]).find("h1").text());
+                }
+
+                var it_text = element.parents("li.it").find("h2").text();
+
+                return parent_description_text.join(" ") + " " + it_text + ": " + element.text();
               }).get().join("\\n");
-        
+
               ajax({
                 type: "POST",
-                url: '/session/finish',
+                url: '#{ScrewUnit::Resources::SeleniumSession.path("/finish")}',
                 data: {"text": error_text}
               });
             });
           })(jQuery);
-        </script>
-        <link rel="stylesheet" href="/core/screw.css" />
-        HTML
-        spec_files.each do |file|
-          html << %{<script type="text/javascript" src="#{file.relative_path}"></script>\n}
-        end
-
-        html << <<-HTML
-        </head>
-        <body>
-        <div id="screw_unit_content"></div>
-        </body>
-        </html>
-        HTML
-        connection.send_head
-        connection.send_body(html.gsub(/^        /, ""))
+        JS
+        project_js_files
+        link :rel => "stylesheet", :href => "/core/screw.css"
+        project_css_files
+
+        spec_script_elements
+      end
+
+      def core_js_files
+        script :src => jquery_js_file
+        script :src => "/core/jquery.fn.js"
+        script :src => "/core/jquery.print.js"
+        script :src => "/core/screw.builder.js"
+        script :src => "/core/screw.matchers.js"
+        script :src => "/core/screw.events.js"
+        script :src => "/core/screw.behaviors.js"
+      end
+
+      def project_js_files
+      end
+
+      def project_css_files
+      end
+
+      def jquery_js_file
+        "/core/jquery-1.3.2.js"
+      end
+
+      def body_content
+        div :id => "screw_unit_content"
       end
     end
   end
-end
+end