rspec-cells 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63aa56b8e9ae132537ab2992ad9ed08783ed7350
-  data.tar.gz: 825b81132c90eac0bbec8924205c9318e4c94868
+  metadata.gz: b00052a706101e635fbfd70d6d3b38feef321326
+  data.tar.gz: 22ae5044d29a41ca4107dc3be88e888b21177c35
 SHA512:
-  metadata.gz: 17ee62a830230d3823dde7cd9aeaf41e1789aff3381b21f89a3caf0bf503a3ccf1caffa7ad2f4fafcab87a55f0a5d163acd355b0c099a8d541f1ab1ccb588722
-  data.tar.gz: 8171f1ff29d0fbaefe365c65973f58dd5fea98e32807c1798608c2eaf90ad0436c6b311ee88308d1c66870e34b2fba97a2e78b1c81710a7f0d6d99af9193e229
+  metadata.gz: 3d8d79e4ffc7bac6710ae8f2ed3c50a9b721726e44129001aed422f791a7b3394c8ce45e26509d78627629f216c4680934ae5fbf45cbc42feeba750696831b0d
+  data.tar.gz: 5443a773b0ac3191fd81bed77f5d11507f192eacdd14e114241ccf7e48bcf46d6dc62f69676f19f63b445ea723bd8175d9571d185d534cde2c857669076ca705

data/.gitignore

@@ -1,5 +1,5 @@
 .idea/
-Gemfile.lock
+*.lock
 *.gem
 /.rvmrc
 spec/tmp

data/.travis.yml

@@ -1,5 +1,12 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
+  - rbx-2
+
+gemfile:
+  - gemfiles/rspec2.gemfile
+  - gemfiles/rspec3.gemfile
+
 notifications:
   irc: "irc.freenode.org#cells"

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "rspec2" do
+ gem "rspec-rails", "2.99"
+end
+
+appraise "rspec3" do
+ gem "rspec-rails", ">= 3.0.0"
+end
+

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 0.2.0
+
+* rspec-cells only works with rspec >= 2.99 and uses the expect syntax. Thanks to @seuros for his help.
+
 h2. 0.1.12
 
 * Remove `respond_to` tests from generated tests.

data/Gemfile

@@ -2,4 +2,5 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem "rails", "3.2.12"
+gem 'rails', '~> 3.2'
+gem 'appraisal'

data/README.rdoc

@@ -12,7 +12,7 @@ Cells is Rails' popular {view components framework}[http://github.com/apotonick/
 
 This gem runs with RSpec2 and Rails >= 3.x, so just add it to your app's +Gemfile+.
 
-  group :test do
+  group :development, :test do
     gem "rspec-cells"
   end
 
@@ -32,7 +32,7 @@ will create an exemplary <tt>spec/cells/blog_post_cell_spec.rb</tt> for you.
 In your specs you can use +render_cell+ to assert the rendered markup (or whatever your state is supposed to do). This goes fine with Webrat matchers.
 
   it "renders posts count" do
-    render_cell(:posts, :count).should have_selector("p", :content => "4 posts!")
+    expect(render_cell(:posts, :count)).to have_selector("p", :content => "4 posts!")
   end
 
 You can create a cell instance using the +cell+ method, and then render afterwards. This is helpful when you're planning to stub things or if you need to pass arguments to the cell constructor.
@@ -41,7 +41,7 @@ You can create a cell instance using the +cell+ method, and then render afterwar
     posts = cell(:posts)
     posts.stub(:recent_posts).and_return([])
 
-    posts.render_state(:count).should have_selector("p", :content => "No posts!")
+    expect(posts.render_state(:count)).to have_selector("p", :content => "No posts!")
   end
 
 After preparing the instance you can use +render_state+ for triggering the state.
@@ -52,7 +52,7 @@ After preparing the instance you can use +render_state+ for triggering the state
 With the introduction of cells [view models](https://github.com/apotonick/cells#view-models) you get a slightly different API for your specs (which is identical to your app's one).
 
   it "renders empty posts list" do
-    posts = cell(:posts).count.should should have_css "#comment_new .flag", visible: true)
+    expect(cell(:posts).count.to be_zero
   end
 
 It's pretty simple, you use `#cell` to instantiate a view model instance and then call the state method on it.
@@ -76,22 +76,22 @@ You can then use capybara's matchers in your cell spec.
       let(:search) { render_cell(:posts, :search) }
 
       it "should have a search field" do
-        search.should have_field("Search by Title")
+        expect(search).to have_field("Search by Title")
       end
 
       it "should have a search button" do
-        search.should have_button("Search")
+        expect(search).to have_button("Search")
       end
     end
 
     describe "latest posts" do
       subject { render_cell(:posts, :latest) }
 
-      it { should have_css("h3.title", :text => "Latest Posts") }
-      it { should have_table("latest_posts") }
-      it { should have_link("View all Posts") }
-      it { should_not have_button("Create Post") }
-      it { should_not have_field("Search by Title") }
+      it { is_expected.to have_css("h3.title", :text => "Latest Posts") }
+      it { is_expected.to have_table("latest_posts") }
+      it { is_expected.to have_link("View all Posts") }
+      it { is_expected.to_not have_button("Create Post") }
+      it { is_expected.to_not have_field("Search by Title") }
     end
   end
 

data/gemfiles/rspec2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2"
+gem "appraisal"
+gem "rspec-rails", "2.99"
+
+gemspec :path => "../"

data/gemfiles/rspec3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2"
+gem "appraisal"
+gem "rspec-rails", ">= 3.0.0"
+
+gemspec :path => "../"

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

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe <%= class_name %>Cell do
+describe <%= class_name %>Cell, type: :cell do
 
-  context "cell rendering" do
+  context 'cell rendering' do
   <%- actions.each_with_index do |state, index| -%>
-    context "rendering <%= state %>" do
+    context 'rendering <%= state %>' do
       subject { render_cell(<%= cell_name %>, :<%= state %>) }
 
       <%- if defined?(Capybara) -%>
-      it { should have_selector("h1", :text => "<%= class_name %>#<%= state %>") }
-      it { should have_selector("p", :text => "Find me in app/cells/<%= file_path %>/<%= state %>.html") }
+      it { is_expected.to have_selector('h1', text: '<%= class_name %>#<%= state %>') }
+      it { is_expected.to have_selector('p', text: 'Find me in app/cells/<%= file_path %>/<%= state %>.html') }
       <%- else -%>
-      it { should include "<%= class_name %>#<%= state %>" }
-      it { should include "Find me in app/cells/<%= file_path %>/<%= state %>.html" }
+      it { is_expected.to include '<%= class_name %>#<%= state %>' }
+      it { is_expected.to include 'Find me in app/cells/<%= file_path %>/<%= state %>.html' }
       <%- end -%>
     end
     <%- unless index == actions.length - 1 -%>

data/lib/rspec/cells/cell_example_group.rb

@@ -7,16 +7,15 @@ module RSpec::Rails
     include Cell::TestCase::TestMethods
     include ActionController::UrlFor
 
-    if defined?(Webrat)
-      include Webrat::Matchers
-      include Webrat::Methods
-    end
+    if defined?(::Webrat)
+      include ::Webrat::Matchers
+      include ::Webrat::Methods
 
-    if defined?(Capybara)
+    elsif defined?(::Capybara)
       begin
-        include Capybara::DSL
+        include ::Capybara::DSL
       rescue NameError
-        include Capybara
+        include ::Capybara
       end
 
       # Overwrite to wrap render_cell into a Capybara custom string with a
@@ -33,11 +32,11 @@ module RSpec::Rails
       # That expose all the methods from the following capybara modules:
       #   - http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Matchers
       #   - http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Finders
-      def render_cell(*args)
+      def render_cell(*)
         Capybara.string super
       end
 
-      def cell(*args)
+      def cell(*)
         Content.new(super)
       end
 
@@ -84,5 +83,6 @@ module RSpec::Rails
 end
 
 RSpec.configure do |c|
-  c.include RSpec::Rails::CellExampleGroup, :example_group => { :file_path => /spec\/cells/ }
+  c.include RSpec::Rails::CellExampleGroup, :file_path => /spec\/cells/
+  c.include RSpec::Rails::CellExampleGroup, :type => :cell
 end

data/lib/rspec/cells/version.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Cells
-    VERSION = '0.1.12'
+    VERSION = '0.2.0'
   end
 end
 

data/lib/rspec-cells.rb

@@ -1,3 +1,4 @@
+require 'rails/railtie'
 module RSpec
   module Cells
     class Railtie < ::Rails::Railtie

data/rspec-cells.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "railties",    ">= 3.0"
-  s.add_runtime_dependency "rspec-rails", ">= 2.2.0"
+  s.add_runtime_dependency 'rspec-rails', '>= 2.99'
   s.add_runtime_dependency "cells",       ">= 3.4.0"
 end

data/spec/cells/cell_generator_spec.rb

@@ -32,24 +32,24 @@ describe Rspec::Generators::CellGenerator do
 
     it "creates widget spec" do
       test.assert_file "spec/cells/twitter_cell_spec.rb", t("require 'spec_helper'")
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('describe TwitterCell do')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "cell rendering" do')
+      test.assert_file "spec/cells/twitter_cell_spec.rb", t('describe TwitterCell, type: :cell do')
+      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context \'cell rendering\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
 
     it 'creates display state' do
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "rendering display" do')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('context \'rendering display\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('subject { render_cell(:twitter, :display) }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should have_selector("h1", :text => "Twitter#display") }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should have_selector("p", :text => "Find me in app/cells/twitter/display.html") }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to have_selector(\'h1\', text: \'Twitter#display\') }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to have_selector(\'p\', text: \'Find me in app/cells/twitter/display.html\') }')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
 
     it 'creates form state' do
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "rendering form" do')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('context \'rendering form\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('subject { render_cell(:twitter, :form) }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should have_selector("h1", :text => "Twitter#form") }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should have_selector("p", :text => "Find me in app/cells/twitter/form.html") }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to have_selector(\'h1\', text: \'Twitter#form\') }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to have_selector(\'p\', text: \'Find me in app/cells/twitter/form.html\') }')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
   end
@@ -65,24 +65,24 @@ describe Rspec::Generators::CellGenerator do
 
     it "creates widget spec" do
       test.assert_file "spec/cells/twitter_cell_spec.rb", t("require 'spec_helper'")
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('describe TwitterCell do')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "cell rendering" do')
+      test.assert_file "spec/cells/twitter_cell_spec.rb", t('describe TwitterCell, type: :cell do')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('context \'cell rendering\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
 
     it 'creates display state' do
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "rendering display" do')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('context \'rendering display\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('subject { render_cell(:twitter, :display) }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should include "Twitter#display" }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should include "Find me in app/cells/twitter/display.html" }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to include \'Twitter#display\' }')
+      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { is_expected.to include \'Find me in app/cells/twitter/display.html\' }')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
 
     it 'creates form state' do
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('context "rendering form" do')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('context \'rendering form\' do')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('subject { render_cell(:twitter, :form) }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should include "Twitter#form" }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('it { should include "Find me in app/cells/twitter/form.html" }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to include \'Twitter#form\' }')
+      test.assert_file 'spec/cells/twitter_cell_spec.rb', t('it { is_expected.to include \'Find me in app/cells/twitter/form.html\' }')
       test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
     end
   end
@@ -101,24 +101,24 @@ describe Rspec::Generators::CellGenerator do
 
     it "creates widget spec" do
       test.assert_file GENERATED_FILE, t("require 'spec_helper'")
-      test.assert_file GENERATED_FILE, t('describe Forum::CommentCell do')
-      test.assert_file GENERATED_FILE, t('context "cell rendering" do')
+      test.assert_file GENERATED_FILE, t('describe Forum::CommentCell, type: :cell do')
+      test.assert_file GENERATED_FILE, t('context \'cell rendering\' do')
       test.assert_file GENERATED_FILE, t('end')
     end
 
     it 'creates display state' do
-      test.assert_file GENERATED_FILE, t('context "rendering display" do')
+      test.assert_file GENERATED_FILE, t('context \'rendering display\' do')
       test.assert_file GENERATED_FILE, t('subject { render_cell("forum/comment", :display) }')
-      test.assert_file GENERATED_FILE, t('it { should include "Forum::Comment#display" }')
-      test.assert_file GENERATED_FILE, t('it { should include "Find me in app/cells/forum/comment/display.html" }')
+      test.assert_file GENERATED_FILE, t('it { is_expected.to include \'Forum::Comment#display\' }')
+      test.assert_file GENERATED_FILE, t('it { is_expected.to include \'Find me in app/cells/forum/comment/display.html\' }')
       test.assert_file GENERATED_FILE, t('end')
     end
 
     it 'creates form state' do
-      test.assert_file GENERATED_FILE, t('context "rendering form" do')
+      test.assert_file GENERATED_FILE, t('context \'rendering form\' do')
       test.assert_file GENERATED_FILE, t('subject { render_cell("forum/comment", :form) }')
-      test.assert_file GENERATED_FILE, t('it { should include "Forum::Comment#form" }')
-      test.assert_file GENERATED_FILE, t('it { should include "Find me in app/cells/forum/comment/form.html" }')
+      test.assert_file GENERATED_FILE, t('it { is_expected.to include \'Forum::Comment#form\' }')
+      test.assert_file GENERATED_FILE, t('it { is_expected.to include \'Find me in app/cells/forum/comment/form.html\' }')
       test.assert_file GENERATED_FILE, t('end')
     end
   end

data/spec/cells/cell_spec_spec.rb

@@ -22,26 +22,26 @@ module RSpec::Rails
     end
 
     it "adds :type => :cell to the metadata" do
-      group.metadata[:type].should eq(:cell)
+      expect(group.metadata[:type]).to eq(:cell)
     end
 
     describe "#render_cell" do
       it "renders a state" do
-        group.new.render_cell(:dummy, :show).should == "<p>I'm Dummy.</p>"
+        expect(group.new.render_cell(:dummy, :show)).to eq("<p>I'm Dummy.</p>")
       end
 
       it "allows passing state args" do
-        group.new.render_cell(:dummy, :update, "this").should == "Updating this."
+        expect(group.new.render_cell(:dummy, :update, "this")).to eq('Updating this.')
       end
     end
 
     it "responds to #cell" do
-      group.new.cell(:dummy).should be_kind_of(DummyCell)
+      expect(group.new.cell(:dummy)).to be_kind_of(DummyCell)
     end
 
     # FIXME: could anyone make capybara/rails work in these tests?
     # it "allows using matchers with #render_state" do
-    #   cell(:dummy).render_state(:show).should have_selector("p")
+    #   expect(cell(:dummy).render_state(:show)).to have_selector("p")
     # end
 
     context "as a test writer" do
@@ -49,15 +49,15 @@ module RSpec::Rails
 
       it "should support _path helpers from the controller" do
         # We have to stub include so that things determine the route exists.
-        Rails.application.routes.named_routes.helpers.stub(:include?).and_return(:true)
-        @controller.should_receive(:test_path).at_least(:once)
+        allow(Rails.application.routes.named_routes.helpers).to receive(:include?).and_return(true)
+        expect(@controller).to receive(:test_path).at_least(:once)
         test_path
       end
 
       it "should support polymorphic_path from the controller" do
         # We have to stub include so that things determine the route exists.
-        Rails.application.routes.named_routes.helpers.stub(:include?).and_return(:true)
-        @controller.should_receive(:test_path).at_least(:once)
+        allow(Rails.application.routes.named_routes.helpers).to receive(:include?).and_return(true)
+        expect(@controller).to receive(:test_path).at_least(:once)
         polymorphic_path(:test)
       end
 

data/spec/spec_helper.rb

@@ -2,7 +2,9 @@ require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
 
 #$:.unshift File.dirname(__FILE__) # add current dir to LOAD_PATHS
-require "rails/all"
+require 'rails'
+require 'action_controller/railtie'
+require 'action_view/railtie'
 require 'rspec-cells'
 require 'rspec/rails'
 require 'cell/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-cells
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: cells
   requirement: !ruby/object:Gem::Requirement
@@ -61,11 +61,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGES.textile
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- gemfiles/rspec2.gemfile
+- gemfiles/rspec3.gemfile
 - lib/generators/rspec/cell_generator.rb
 - lib/generators/rspec/templates/cell_spec.erb
 - lib/rspec-cells.rb