cancan-unit-test 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa942f63f5ef9c7e8d0e568d49fe7a6bc2781c14
-  data.tar.gz: e2814f79002bf4a8594ad1632fa2124bb1b970a6
+  metadata.gz: e9e2b945553ad617f4b57370cc34859783e41a6c
+  data.tar.gz: de87f9780b9251614cf22f4d1fa243d1078405a6
 SHA512:
-  metadata.gz: abd119ec9e7292d3f1885c486422b667bbc5fb7ba4705695737c68e3537be602e429820f598b39430ebba12e62abb3b29e825f41920037c3759a4c2843ae8508
-  data.tar.gz: 92bd77b5b3813620e6f0f8fb0fe1157bc97dc94c4f3de8d8b39623db4b661f2b0bf7ea7392b4c57d609be28ac233e177b490a7b239825486a4a5302f2fb5f642
+  metadata.gz: cf9925e1106e20ee585d78e8ecbc0ac83bd59e5c630bce327d797133c16f36e15f15d1f1086c4072142bd1529d454f13ae5246e1e64f28788264725fa3dc25ab
+  data.tar.gz: 730fa71ca846465dfacf7e01b14ec6e024bfdf05419e33d4eebe086d3cce88e35dfaa540f5055c23aeeebc31c80cc1ec54c35a531048d847fe2e3fabd57b362d

data/.gitignore

@@ -17,7 +17,7 @@ tmp
 integration/fixtures/dummy/log
 integration/fixtures/dummy/*.gem
 integration/fixtures/dummy/*.rbc
-integration/fixtures/dummy/db/*.sqlite3
+integration/fixtures/dummy/db/development.sqlite3
 integration/fixtures/dummy/.bundle
 integration/fixtures/dummy/.config
 integration/fixtures/dummy/.yardoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cancan-unit-test (0.0.2)
+    cancan-unit-test (0.0.3)
       activesupport
       cancan
 

data/integration/controllers/posts_controller_spec.rb

@@ -28,9 +28,18 @@ describe PostsController do
       stub_load_and_authorize_singleton_resource(:post, instance_method: :i_am_not_right) { article }
     end
 
-    it "warns that there was no stub found" do
-      STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :post'")
-      post :create
+    context "and warnings turned on", cancan_unit_test_warning: true do
+      it "warns that there was no stub found" do
+        STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :post'")
+        post :create
+      end
+    end
+
+    context "and warnings defaulting to off" do
+      it "warns that there was no stub found" do
+        STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :post'")
+        post :create
+      end
     end
   end
 end

data/integration/controllers/posts_controller_spec.rb.orig

@@ -0,0 +1,36 @@
+require 'integration_helper'
+
+describe PostsController do
+  context "not stubbing" do
+    it "uses can can" do
+      post :create
+      assigns(:post).should be_a Post
+    end
+  end
+
+  context "stubbing load and authorize with a singleton" do
+    let_double(:article)
+
+    before do
+      stub_load_and_authorize_singleton_resource(:post) { article }
+    end
+
+    it "uses the stub" do
+      post :create
+      assigns(:post).should == article
+    end
+  end
+
+  context "stubbing with incorrect matchers" do
+    let_double(:article)
+
+    before do
+      stub_load_and_authorize_singleton_resource(:post, instance_method: :i_am_not_right) { article }
+    end
+
+    it "warns that there was no stub found" do
+      STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :post'")
+      post :create
+    end
+  end
+end

data/lib/cancan_unit_test/cancan/controller_resource.rb

@@ -6,6 +6,14 @@ module CancanUnitTest
     module ControllerResource
       extend ::ActiveSupport::Concern
 
+      def self.show_warnings= value
+        @show_warnings = value
+      end
+
+      def self.show_warnings
+        @show_warnings ||= false
+      end
+
       def _shim_load_and_authorize_resource
         model_name = resource_class.model_name.underscore
 
@@ -18,11 +26,17 @@ module CancanUnitTest
           self.resource_instance = singleton_stub.call if singleton_stub
           self.collection_instance = collection_stub.call if collection_stub
         else
-          puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :#{model_name}'")
+          warn_about_missing_stub(model_name) if ControllerResource.show_warnings
           _original_load_and_authorize_resource
         end
       end
 
+      private
+
+      def warn_about_missing_stub(model_name)
+        puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :#{model_name}'")
+      end
+
       included do
         alias_method :_original_load_and_authorize_resource, :load_and_authorize_resource
         alias_method :load_and_authorize_resource, :_shim_load_and_authorize_resource

data/lib/cancan_unit_test/cancan/controller_resource.rb.orig

@@ -0,0 +1,39 @@
+require 'active_support/concern'
+require 'active_support/inflector'
+
+module CancanUnitTest
+  module CanCan
+    module ControllerResource
+      extend ::ActiveSupport::Concern
+
+      def _shim_load_and_authorize_resource
+        model_name = resource_class.model_name.underscore
+
+        stub_finder = StubFinder.new(@controller, :load_and_authorize_resource)
+
+        singleton_stub = stub_finder.find_by_singleton(model_name.to_sym, @options)
+        collection_stub = stub_finder.find_by_collection(model_name.to_sym, @options)
+
+        if (singleton_stub || collection_stub)
+          self.resource_instance = singleton_stub.call if singleton_stub
+          self.collection_instance = collection_stub.call if collection_stub
+        else
+          puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :#{model_name}'")
+          _original_load_and_authorize_resource
+        end
+      end
+
+      included do
+        alias_method :_original_load_and_authorize_resource, :load_and_authorize_resource
+        alias_method :load_and_authorize_resource, :_shim_load_and_authorize_resource
+      end
+    end
+  end
+end
+
+
+if defined? CanCan::ControllerResource
+  CanCan::ControllerResource.class_eval do
+    include CancanUnitTest::CanCan::ControllerResource
+  end
+end

data/lib/cancan_unit_test/mocks.rb

@@ -8,5 +8,16 @@ module CancanUnitTest
     def stub_load_and_authorize_collection_resource(model, options={}, &block)
       controller._add_cancan_unit_test_stub(:load_and_authorize_resource, :collection, model, options, &block)
     end
+
+    RSpec.configure do |config|
+      config.before(:each, cancan_unit_test_warning: true) do
+        CancanUnitTest::CanCan::ControllerResource.show_warnings = true
+      end
+
+      config.after(:each, cancan_unit_test_warning: true) do
+        CancanUnitTest::CanCan::ControllerResource.show_warnings = false
+      end
+    end
+
   end
 end

data/lib/cancan_unit_test/mocks.rb.orig

@@ -0,0 +1,12 @@
+module CancanUnitTest
+  module Mocks
+
+    def stub_load_and_authorize_singleton_resource(model, options={}, &block)
+      controller._add_cancan_unit_test_stub(:load_and_authorize_resource, :singleton, model, options, &block)
+    end
+
+    def stub_load_and_authorize_collection_resource(model, options={}, &block)
+      controller._add_cancan_unit_test_stub(:load_and_authorize_resource, :collection, model, options, &block)
+    end
+  end
+end

data/lib/cancan_unit_test/version.rb

@@ -1,3 +1,3 @@
 module CancanUnitTest
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cancan_unit_test/version.rb.orig

@@ -0,0 +1,3 @@
+module CancanUnitTest
+  VERSION = "0.0.2"
+end

data/spec/cancan/controller_resource_spec.rb

@@ -52,11 +52,25 @@ module CancanUnitTest
             expect { controller_resource.load_and_authorize_resource }.to raise_error "original called"
           end
 
-          it "warns that there was no stub found" do
-            STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
-            begin
-              controller_resource.load_and_authorize_resource
-            rescue
+          context "when showing warning" do
+            it "does not warn that there was no stub found" do
+              ControllerResource.show_warnings = true
+              STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
+              begin
+                controller_resource.load_and_authorize_resource
+              rescue
+              end
+            end
+          end
+
+          context "when suppressing warning" do
+            it "warns that there was no stub found" do
+              ControllerResource.show_warnings = false
+              STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
+              begin
+                controller_resource.load_and_authorize_resource
+              rescue
+              end
             end
           end
         end

data/spec/cancan/controller_resource_spec.rb.orig

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+module CancanUnitTest
+  module CanCan
+    describe ControllerResource do
+
+      class TestControllerResource
+        def initialize(model_name, options, controller)
+          @options = options
+          @model_name = model_name
+          @controller = controller
+        end
+
+        def resource_instance=(value) end
+
+        def collection_instance=(value) end
+
+        def load_and_authorize_resource
+          raise "original called"
+        end
+
+        def resource_class
+          OpenStruct.new({ model_name: @model_name })
+        end
+
+        include CancanUnitTest::CanCan::ControllerResource
+      end
+
+      describe "#load_and_authorize_resource" do
+
+        let(:controller_resource) { TestControllerResource.new(model_name, options, controller) }
+        let(:model_name) { "TheModelName" }
+        let_double(:controller)
+        let_double(:options)
+
+        let_double(:block_result)
+        let(:block) { double(:block, call: block_result) }
+
+        let_double(:stub_finder)
+
+        before do
+          StubFinder.stub(:new).with(controller, :load_and_authorize_resource) { stub_finder }
+          stub_finder.stub(:find_by_singleton).with(:the_model_name, options) { singleton_results }
+          stub_finder.stub(:find_by_collection).with(:the_model_name, options) { collection_results }
+        end
+
+        context "when a stub doesn't exist for the resource" do
+          let(:singleton_results) { nil }
+          let(:collection_results) { nil }
+
+          it "calls through to the original method" do
+            expect { controller_resource.load_and_authorize_resource }.to raise_error "original called"
+          end
+
+          it "warns that there was no stub found" do
+            STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
+            begin
+              controller_resource.load_and_authorize_resource
+            rescue
+            end
+          end
+        end
+
+        context "when a singleton stub for the resource exists" do
+          let(:singleton_results) { block }
+          let(:collection_results) { nil }
+
+          it "calls the stub" do
+            block.should_receive(:call)
+            controller_resource.load_and_authorize_resource
+          end
+
+          it "assigns the stub to resource_instance" do
+            controller_resource.should_receive(:resource_instance=).with(block_result)
+            controller_resource.load_and_authorize_resource
+          end
+        end
+
+        context "when a collection stub for the resource exists" do
+          let(:singleton_results) { nil }
+          let(:collection_results) { block }
+
+          it "calls the stub" do
+            block.should_receive(:call)
+            controller_resource.load_and_authorize_resource
+          end
+
+          it "assigns the stub to collection_instance" do
+            controller_resource.should_receive(:collection_instance=).with(block_result)
+            controller_resource.load_and_authorize_resource
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancan-unit-test
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Todd Mohney, Rasheed Abdul-Aziz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
@@ -155,6 +155,7 @@ files:
 - cancan_unit_test.gemspec
 - integration/controllers/comments_controller_spec.rb
 - integration/controllers/posts_controller_spec.rb
+- integration/controllers/posts_controller_spec.rb.orig
 - integration/fixtures/dummy/README.rdoc
 - integration/fixtures/dummy/Rakefile
 - integration/fixtures/dummy/app/assets/javascripts/application.js
@@ -191,6 +192,7 @@ files:
 - integration/fixtures/dummy/db/migrate/20130712144534_create_authors.rb
 - integration/fixtures/dummy/db/migrate/20130712144551_create_comments.rb
 - integration/fixtures/dummy/db/schema.rb
+- integration/fixtures/dummy/db/test.sqlite3
 - integration/fixtures/dummy/lib/assets/.gitkeep
 - integration/fixtures/dummy/log/.gitkeep
 - integration/fixtures/dummy/public/404.html
@@ -202,11 +204,15 @@ files:
 - lib/cancan_unit_test/action_controller/stub_registry.rb
 - lib/cancan_unit_test/action_controller_extensions.rb
 - lib/cancan_unit_test/cancan/controller_resource.rb
+- lib/cancan_unit_test/cancan/controller_resource.rb.orig
 - lib/cancan_unit_test/cancan_extensions.rb
 - lib/cancan_unit_test/mocks.rb
+- lib/cancan_unit_test/mocks.rb.orig
 - lib/cancan_unit_test/stub_finder.rb
 - lib/cancan_unit_test/version.rb
+- lib/cancan_unit_test/version.rb.orig
 - spec/cancan/controller_resource_spec.rb
+- spec/cancan/controller_resource_spec.rb.orig
 - spec/integration_helper.rb
 - spec/mocks_spec.rb
 - spec/rails/action_controller/stub_registry_spec.rb
@@ -237,6 +243,7 @@ specification_version: 4
 summary: Unit test helpers for CanCan
 test_files:
 - spec/cancan/controller_resource_spec.rb
+- spec/cancan/controller_resource_spec.rb.orig
 - spec/integration_helper.rb
 - spec/mocks_spec.rb
 - spec/rails/action_controller/stub_registry_spec.rb