merb_screw_unit 0.9.7 → 0.9.8

data/public/javascripts/screw.matchers.js

@@ -1,4 +1,9 @@
 Screw.Matchers = (function($) {
+  var jquerize = function(obj) {
+    if(typeof obj == "string") return iframeWindow.$(obj);
+    else return obj;
+  }
+
   return matchers = {
     expect: function(actual) {
       return {
@@ -15,12 +20,39 @@ Screw.Matchers = (function($) {
       }
     },
     
+    exist: {
+      match: function(expected, actual) {
+        return actual.length > 0;
+      },
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + "exist";
+      }
+    },
+
+    contain_text: {
+      match: function(expected, actual) {
+        return jquerize(actual).filter(":contains(\"" + expected + "\")").length > 0;
+      },
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(jquerize(actual)) + (not ? ' to not have ' : ' to have ') + $.print(expected);
+      }
+    },
+
     have: {
       match: function(expected, actual) {
-        return actual.find(expected).length > 0;
+        return jquerize(actual).find(expected).length > 0;
+      },
+      failure_message: function(expected, actual, not) {
+        return 'expected ' + $.print(jquerize(actual)) + (not ? ' to not have ' : ' to have ') + $.print(expected);
+      }
+    },
+
+    be_visible: {
+      match: function(expected, actual) {
+        return jquerize(actual).is(":visible");
       },
       failure_message: function(expected, actual, not) {
-        return 'expected ' + $.print(actual) + (not ? ' to not have ' : ' to have ') + $.print(expected);
+        return 'expected ' + $.print(jquerize(actual)) + (not ? ' to not ' : ' to ') + "be visible";
       }
     },
     
@@ -61,13 +93,14 @@ Screw.Matchers = (function($) {
     
     be_empty: {
       match: function(expected, actual) {
-        if (actual.length == undefined) throw(actual.toString() + " does not respond to length");
+        if (jquerize(actual).length == undefined)
+          throw($.print(jquerize(actual)) + " 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');
+        return 'expected ' + $.print(jquerize(actual)) + (not ? ' to not be empty' : ' to be empty');
       }
     }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_screw_unit
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-10-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-slices
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 description: Merb Slice that provides support for Screw.Unit testing
 email: ykatz@engineyard.com
@@ -65,7 +65,7 @@ files:
 - app/views/main
 - app/views/main/index.html.erb
 - public/javascripts
-- public/javascripts/jquery-1.2.3.js
+- public/javascripts/jquery-1.2.6.js
 - public/javascripts/jquery.fn.js
 - public/javascripts/jquery.print.js
 - public/javascripts/master.js