rspec-cells 0.0.3 → 0.0.4

data/CHANGES.textile

@@ -1,3 +1,9 @@
+h2. 0.0.4
+ 
+h3. Changes
+  * Use Capybara's string matchers in your specs now (if you like)!
+
+
 h2. 0.0.2
  
 h3. Bugfixes

data/README.rdoc

@@ -16,15 +16,38 @@ This gem runs with RSpec2 and Rails 3.0, so just add it to your app's +Gemfile+.
 
 = Usage
 
-Put all your specs under <tt>spec/cells</tt> folder. Here is how a simple spec could look like.
+Simply put all your specs in the <tt>spec/cells</tt> directory. However, let the cell generator do that for you!
+  
+  rails g cell blog_post show -t rspec
+
+will create an exemplary <tt>spec/cells/blog_post_cell_spec.rb</tt> for you.
+
+== Webrat
+
+Webrat matchers just work as you might have expected - here is how a simple spec could look like.
 
   describe PostsCell do
     it "should render the posts count" do
       render_cell(:posts, :count).should have_selector("p", :content => "4 posts!")
     end
+  end
+
+== Capybara
+
+If you want Capybara's string matchers be sure to bundle at least capybara +0.4.1+ in your Gemfile.
 
+  gem "capybara", "~> 0.4.1"
+
+You can then use capybara's matchers in your cell spec.
+
+ describe PostsCell do
+    it "should render the posts count" do
+      render_cell(:posts, :box).should have_css("div#widget h3")
+    end
   end
 
+  
+== Running the specs
 
 Run your examples with
 
@@ -32,6 +55,9 @@ Run your examples with
 
 If you need more helpers, matchers and stuff, {just let us know}[http://cells.rubyforge.org/community.html].
 
+== Contributors
+
+* Jorge Calás Lozano <calas@qvitta.net> (Cleanup, capybara string matchers)
 
 == LICENSE
 

data/lib/generators/rspec/templates/cell_spec.erb

@@ -6,16 +6,15 @@ describe <%= class_name %>Cell do
     context "rendering <%= state %>" do
       subject { render_cell(:<%= file_name %>, :<%= state %>) }
   
-      it { should have_selector("h1", :text => "<%= class_name %>#<%= state %>") }
-      it { should have_selector("p", :text => "Find me in app/cells/<%= file_name %>/<%= state %>.html") }
+      it { should have_selector("h1", :content => "<%= class_name %>#<%= state %>") }
+      it { should have_selector("p", :content => "Find me in app/cells/<%= file_name %>/<%= state %>.html") }
     end
     <% end %>
   end
 
 
   context "cell instance" do 
-    subject { cell(:<%= file_name %>) }
-  
+    subject { cell(:<%= file_name %>) } 
     <% for state in actions %>
       it { should respond_to(:<%= state %>) }
     <% end %>

data/lib/rspec/cells/capybara/string_matchers.rb

@@ -0,0 +1,47 @@
+# This includes a backported version of the Capybara string matchers David Chelimsky
+# is preparing in https://github.com/dchelimsky/capybara/tree/rspec-matchers
+#
+# Looks like the string matchers will be included in Capybara 0.4.2 if the feature is ready.
+#
+# The branch have not being merged into master because it's missing support for the capybara
+# page object.
+#
+# When we test a rendered cell with the `render_cell` method we get an ActionView::OutputBuffer
+# instance, it is in short, a safe version of String, so we are testing a String, not a capybara
+# page object. So the matchers are OK and the missing features won't bother us.
+#
+# Follow up in http://groups.google.com/group/ruby-capybara/browse_thread/thread/c8adaa8f750b1020
+module RSpec
+  module Cells
+    module Capybara
+      module StringMatchers
+        extend ::RSpec::Matchers::DSL
+
+        %w[css xpath selector].each do |type|
+          matcher "have_#{type}" do |*args|
+            match_for_should do |string|
+              ::Capybara::string(string).send("has_#{type}?", *args)
+            end
+
+            match_for_should_not do |string|
+              ::Capybara::string(string).send("has_no_#{type}?", *args)
+            end
+
+            failure_message_for_should do |string|
+              "expected #{type} #{formatted(args)} to return something from:\n#{string}"
+            end
+
+            failure_message_for_should_not do |string|
+              "expected #{type} #{formatted(args)} not to return anything from:\n#{string}"
+            end
+
+            def formatted(args)
+              args.length == 1 ? args.first.inspect : args.inspect
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/rspec/cells/version.rb

@@ -1,6 +1,6 @@
 module RSpec # :nodoc:
   module Cells # :nodoc:
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end
 

data/lib/rspec/rails/example/cell_example_group.rb

@@ -1,8 +1,6 @@
 module RSpec::Rails
   # Lets you call #render_cell in Rspec2. Move your cell specs to <tt>spec/cells/</tt>.
   module CellExampleGroup
-    VERSION = "0.0.1"
-
     extend ActiveSupport::Concern
     extend RSpec::Rails::ModuleInclusion
 
@@ -21,9 +19,9 @@ module RSpec::Rails
       begin
         include Capybara::RSpec::StringMatchers
       rescue NameError
-        # Read more in the source file
-        require 'rspec_cells/capybara/string_matchers'
-        include RSpecCells::Capybara::StringMatchers
+        # do this till capybara 0.4.2 is out.
+        require 'rspec/cells/capybara/string_matchers'
+        include RSpec::Cells::Capybara::StringMatchers
       end
     end
 
@@ -43,9 +41,7 @@ module RSpec::Rails
       render_views
       subject { controller }
     end
-
-    # RSpec.configure &include_self_when_dir_matches('spec','cells')  # adds a filter to Configuration that includes this module in matching groups.
-
+    
     RSpec.configure do |c|
       c.include self, :example_group => { :file_path => /spec\/cells/ }
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,10 +79,10 @@ files:
 - lib/generators/rspec/templates/cell_spec.erb
 - lib/rspec-cells.rb
 - lib/rspec/cells.rb
+- lib/rspec/cells/capybara/string_matchers.rb
 - lib/rspec/cells/tasks.rake
 - lib/rspec/cells/version.rb
 - lib/rspec/rails/example/cell_example_group.rb
-- lib/rspec_cells/capybara/string_matchers.rb
 - rspec-cells.gemspec
 - spec/cells/cell_spec_spec.rb
 - spec/spec_helper.rb

data/lib/rspec_cells/capybara/string_matchers.rb

@@ -1,45 +0,0 @@
-# This includes a backported version of the Capybara string matchers David Chelimsky
-# is preparing in https://github.com/dchelimsky/capybara/tree/rspec-matchers
-#
-# Looks like the string matchers will be included in Capybara 0.4.2 if the feature is ready.
-#
-# The branch have not being merged into master because it's missing support for the capybara
-# page object.
-#
-# When we test a rendered cell with the `render_cell` method we get an ActionView::OutputBuffer
-# instance, it is in short, a safe version of String, so we are testing a String, not a capybara
-# page object. So the matchers are OK and the missing features won't bother us.
-#
-# Follow up in http://groups.google.com/group/ruby-capybara/browse_thread/thread/c8adaa8f750b1020
-module RSpecCells
-  module Capybara
-    module StringMatchers
-      extend ::RSpec::Matchers::DSL
-
-      %w[css xpath selector].each do |type|
-        matcher "have_#{type}" do |*args|
-          match_for_should do |string|
-            ::Capybara::string(string).send("has_#{type}?", *args)
-          end
-
-          match_for_should_not do |string|
-            ::Capybara::string(string).send("has_no_#{type}?", *args)
-          end
-
-          failure_message_for_should do |string|
-            "expected #{type} #{formatted(args)} to return something from:\n#{string}"
-          end
-
-          failure_message_for_should_not do |string|
-            "expected #{type} #{formatted(args)} not to return anything from:\n#{string}"
-          end
-
-          def formatted(args)
-            args.length == 1 ? args.first.inspect : args.inspect
-          end
-        end
-      end
-
-    end
-  end
-end