rspec-cells 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bb7e10863444803f37e3899009e49e934c9fcd
-  data.tar.gz: 7c2157373ace7e9b361d445b914f98a7addc29ed
+  metadata.gz: 604ea993632b9bdaa33ba9f8ff1078fa91ff8771
+  data.tar.gz: 8049f0a323f926b009bdab5bea1e11c45b240a06
 SHA512:
-  metadata.gz: 13347dd34e7b79e9478644b77fca6e9f7241fa7f6ac7698747a5711c9cd4a3a018dabb851a95d262288c22471379ff531fe14013f1a8213ef8bb82df5c779b4d
-  data.tar.gz: 2e9bfe4defef29cf0f6e4dce3f675fbb79699f9a856a61a3a329aee7e817986b86b2e5ace2bbdbdbef9157791c4e3aea37e695f8fada3ddbc349bd57d84ca717
+  metadata.gz: c9a0127e3d120f6d2607f0fab9406ac12914c30fa58b0e5726c057d36f465c9fbb1140dde0341d0eb08b76d2d6c3c7f87fadca556645dd29d7511540ed33d58a
+  data.tar.gz: f66d7bb81108bc3ab3b93e13a90ce7227439caa5cb123881cfe3860166da4b6932d162b4506352c334c3614b7d30fd38cece494cdac1a9beaf739605dc812614

data/{CHANGES.textile → CHANGES.md}

@@ -1,83 +1,103 @@
-h2. 0.2.2
+# 0.3.1
+
+* You can now use `::controller` in your examples to set a controller class, in case your cell requires a controller. This also fixes `#controller` in the example which always returned nil before.
+    ```ruby
+    describe Song::Cell do
+      controller SongsController
+
+      it do
+        controller #=> <#SongsController>
+    ```
+
+# 0.3.0
+
+* Only supports Rspec 3 and Cells 4.
+* `#render_cell` is replaced with `cell(:song).call`. See http://trailblazerb.org/gems/cells/testing.html#rspec.
+
+# 0.2.3
+
+* Last release for Cells 3.x.
+
+# 0.2.2
 
 * Allow using `cell.stub(..)` with capybara.
 
-h2. 0.2.1
+# 0.2.1
 
 * Relaxed rspec dependency to >= 2.14.
 * Added `enable_cell_caching!` for specs.
 
-h2. 0.2.0
+# 0.2.0
 
 * rspec-cells depends on rspec >= 2.99 and uses the expect syntax. Thanks to @seuros for his help.
 
-h2. 0.1.12
+# 0.1.12
 
 * Remove `respond_to` tests from generated tests.
 
-h2. 0.1.11
+# 0.1.11
 
 * Make specs work with cell view models.
 
-h2. 0.1.10
+# 0.1.10
 
 * Don't use `have_selector` in generated spec unless Capybara's around.
 * Less restricted dependencies.
 
 
-h2. 0.1.9
+# 0.1.9
 
 * Override #render_state in specs using module in favour of Decorator (broke stubbing).
 
-h2. 0.1.8
+# 0.1.8
 
 * Make @render_state@ return a Capybara string so it gets assertable.
 
-h2. 0.1.7
+# 0.1.7
 
-h2. 0.1.6
+# 0.1.6
 
 * Minor internal fixes.
 
-h2. 0.1.5
+# 0.1.5
 
 * Fixed generated test for namespaced cells.
 
-h2. 0.1.4
+# 0.1.4
 
 * Another maintenance release since we broke the gem with the last release :-)
 
-h2. 0.1.3
+# 0.1.3
 
 * Maintenance release.
 
-h2. 0.1.2
+# 0.1.2
 
 * No more deprecation warnings in Rails 3.2.
 
-h2. 0.1.1
+# 0.1.1
 
 * Fixed indentation in generator. Thanks to Richard Huang [flyerhzm].
 
-h2. 0.1.0
+# 0.1.0
 
 h3. Changes
   * Removed @ViewAssigns@. Maintenance Release.
 
-h2. 0.0.5
+# 0.0.5
 
 h3. Changes
   * Works with RSpec-2.6 now, too.
   * We no longer provide our own Capybara string matchers but delegate to @Capybara.string@. If you ever used the @==@ equality check, this won't work anymore. As a tradeoff, you get all string matchers Capybara comes up with, making rspec-cells forward-compatible.
 
 
-h2. 0.0.4
+# 0.0.4
 
 h3. Changes
   * Use Capybara's string matchers in your specs now (if you like)!
 
 
-h2. 0.0.2
+# 0.0.2
 
 h3. Bugfixes
   * Using a Railtie to correctly load rspec-cells. Caused a dependency problem with capybara before. Thanks to Steve Sloan [CodeMonkeySteve] for fixing and Brandon Dimcheff [bdimcheff] for debugging.

data/gemfiles/rspec3.gemfile

@@ -2,8 +2,4 @@
 
 source "http://rubygems.org"
 
-gem "railties"
-gem "appraisal"
-gem "rspec-rails", ">= 3.0.0"
-
 gemspec :path => "../"

data/lib/rspec-cells.rb

@@ -12,4 +12,6 @@ module RSpec
       end
     end
   end
-end
+end
+
+require "rspec/cells"

data/lib/rspec/cells/example_group.rb

@@ -7,12 +7,12 @@ module RSpec
       include Cell::Testing
       include ActionController::UrlFor
 
-      attr_reader :controller, :routes
+      attr_reader :routes
 
       def method_missing(method, *args, &block)
         # Send the route helpers to the application router.
         if route_defined?(method)
-          @controller.send(method, *args, &block)
+          controller.send(method, *args, &block)
         else
           super
         end
@@ -30,14 +30,25 @@ module RSpec
 
       included do
         metadata[:type] = :cell
+
         before do # called before every it.
           @routes = ::Rails.application.routes
           ActionController::Base.allow_forgery_protection = false
         end
+      end
+
+
+      # DISCUSS: in MiniTest, this is done via inheritable_attr. Doesn't work in Rspec, though.
+      module ControllerClass
+        def controller_class
+          @controller_class
+        end
 
-        # we always render views in rspec-cells, so turn it on.
-        subject { controller }
+        def controller(name)
+          @controller_class = name
+        end
       end
+
     end
   end
 end
@@ -47,4 +58,7 @@ RSpec.configure do |c|
   c.include RSpec::Cells::ExampleGroup, :type => :cell
 
   Cell::Testing.capybara = true if Object.const_defined?(:"Capybara")
+
+  # add Example::controller and ::controller_class. for some reasons, this doesn't get imported from Cell::Testing.
+  c.extend RSpec::Cells::ExampleGroup::ControllerClass
 end

data/lib/rspec/cells/version.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Cells
-    VERSION = '0.3.0'
+    VERSION = "0.3.1"
   end
 end
 

data/rspec-cells.gemspec

@@ -11,9 +11,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Spec your cells.}
   s.description = %q{Use render_cell in your specs.}
   s.license     = 'MIT'
-
-  s.rubyforge_project = "rspec-cells"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/cells/cell_generator_spec.rb

@@ -21,13 +21,12 @@ describe Rspec::Generators::CellGenerator do
 
   context "When defined Capybara" do
     before(:all) do
-      class ::Capybara; end
       test.run_generator %w(Twitter display form)
     end
 
     after(:all) do
       FileUtils.rm_rf(DESTINATION_ROOT) # Cleanup after we are done testing
-      Object.send(:remove_const, :"Capybara")
+      # Object.send(:remove_const, :"Capybara")
     end
 
     it "creates widget spec" do
@@ -54,38 +53,40 @@ describe Rspec::Generators::CellGenerator do
     end
   end
 
-  context "When not defined Capybara" do
-    before(:all) do
-      test.run_generator %w(Twitter display form)
-    end
-
-    after(:all) do
-      FileUtils.rm_rf(DESTINATION_ROOT) # Cleanup after we are done testing
-    end
-
-    it "creates widget spec" do
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t("require 'rails_helper'")
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('RSpec.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('subject { cell(:twitter, Twitter.new).call(:display) }')
-      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.erb\' }')
-      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('subject { cell(:twitter, Twitter.new).call(:form) }')
-      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.erb\' }')
-      test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
-    end
-  end
+  # context "When not defined Capybara" do
+  #   before(:all) do
+  #     test.run_generator %w(Twitter display form)
+  #   end
+
+  #   after(:all) do
+  #     FileUtils.rm_rf(DESTINATION_ROOT) # Cleanup after we are done testing
+  #   end
+
+  #   it "creates widget spec" do
+  #     test.assert_file "spec/cells/twitter_cell_spec.rb", t("require 'rails_helper'")
+  #     test.assert_file "spec/cells/twitter_cell_spec.rb", t('RSpec.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('subject { cell(:twitter, Twitter.new).call(:display) }')
+  #     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.erb\' }')
+  #     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('subject { cell(:twitter, Twitter.new).call(:form) }')
+  #     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.erb\' }')
+  #     test.assert_file "spec/cells/twitter_cell_spec.rb", t('end')
+  #   end
+  # end
+
+  # TODO: does rspec even work without capybara?
 
   context "When uses namespace" do
 
@@ -109,16 +110,16 @@ describe Rspec::Generators::CellGenerator do
     it 'creates display state' do
       test.assert_file GENERATED_FILE, t('context \'rendering display\' do')
       test.assert_file GENERATED_FILE, t('subject { cell("forum/comment", Forum::Comment.new).call(:display) }')
-      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.erb\' }')
+      # 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.erb\' }')
       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('subject { cell("forum/comment", Forum::Comment.new).call(:form) }')
-      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.erb\' }')
+      # 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.erb\' }')
       test.assert_file GENERATED_FILE, t('end')
     end
   end

data/spec/cells/cell_spec_spec.rb

@@ -16,18 +16,12 @@ class SongCell < Cell::ViewModel
   end
 end
 
-describe "Cell::Testing in specs" do
-  include RSpec::Cells::ExampleGroup
+describe "Cell::Testing in specs", type: :cell do
 
   describe "#cell" do
-    it { expect(cell(:dummy).call).to eq("<p>I'm Dummy.</p>") }
+    it { expect(cell(:dummy).call).to have_text("I'm Dummy.") }
 
     # with user options.
-    it { expect(cell(:song, "Don't Have The Cow").call).to eq("Don't Have The Cow!") }
-  end
-
-  describe "Capybara matchers" do
-
-    it { skip "please make Capybara run with the test suite"; expect(cell(:dummy).call).to have_selector("p") }
+    it { expect(cell(:song, "Don't Have The Cow").call).to have_text("Don't Have The Cow!") }
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,4 @@
-require 'rubygems' unless defined?(Gem)
-require 'bundler/setup'
-
 require 'rails'
-require 'action_controller/railtie'
-require 'action_view/railtie'
-require 'rspec-cells'
-require 'rspec/rails'
-require 'cells'
-require 'rspec/cells'
 
 module RSpecCells
   class Application < ::Rails::Application
@@ -15,5 +6,12 @@ module RSpecCells
   end
 end
 
+require 'capybara/rails'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'rspec/rails'
+
+require 'cells'
+require 'rspec-cells'
 
-# require 'capybara/rspec'
+require 'capybara/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-cells
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -48,12 +48,11 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
-- CHANGES.textile
+- CHANGES.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rspec2.gemfile
 - gemfiles/rspec3.gemfile
 - lib/generators/rspec/cell_generator.rb
 - lib/generators/rspec/templates/cell_spec.erb
@@ -87,9 +86,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rspec-cells
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spec your cells.
-test_files: []
+test_files:
+- spec/cells/caching_spec.rb
+- spec/cells/cell_generator_spec.rb
+- spec/cells/cell_spec_spec.rb
+- spec/spec_helper.rb

data/gemfiles/rspec2.gemfile

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