cancan-unit-test 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e2b945553ad617f4b57370cc34859783e41a6c
-  data.tar.gz: de87f9780b9251614cf22f4d1fa243d1078405a6
+  metadata.gz: 152e62cc388cf4a4ac5318cf460adf7f6f2bd725
+  data.tar.gz: 5bbe663f37bc9787002e0ccfb1b42c66f1c2f9c9
 SHA512:
-  metadata.gz: cf9925e1106e20ee585d78e8ecbc0ac83bd59e5c630bce327d797133c16f36e15f15d1f1086c4072142bd1529d454f13ae5246e1e64f28788264725fa3dc25ab
-  data.tar.gz: 730fa71ca846465dfacf7e01b14ec6e024bfdf05419e33d4eebe086d3cce88e35dfaa540f5055c23aeeebc31c80cc1ec54c35a531048d847fe2e3fabd57b362d
+  metadata.gz: 5ad368e034e59e0f45df4c3206081c002120b619478067d1d92f7d1bd8ac48d563249e052b52ab7671e4488c8e26b67c9c3de98641998f41dabb3f363e72ffc7
+  data.tar.gz: ed0744b2111cefbaba0f5e6ab24302873609bb04236472cd2005a4faf4d148e4a0c541886b36728c09dc3a6fbefe80705fd3f9c18fd95de761f493a870ff101e

data/.pairs

@@ -1,18 +1,26 @@
 pairs:
-  co: Cathy O'Connell; cathy
+  dmi: Devon Isakow; devon
   ck: Chien Kuo; ckuo
-  ra: Rasheed Abdul-Aziz; rabdulaziz
   rm: Ryan McGarvey; ryan
   mf: Michael Frederick; mike
   tm: Todd Mohney; todd
   my: Micah Young; myoung
   ba: Alex Babkin; ababkin
   rn: Ryan Nash; rnash
-  dmc: Dennis Cahillane; dcahillane
   jl: Joe Letizia; joe
   jlm: Joe Moore; joemoore
-  dc: Dan Connor; dconner
   lo: Lee Ourand; lourand
+  ps: Peter Swan; pdswan
+  mc: Michael Chinigo; mchinigo
+  int: interview; interview
+  dt: David Tengdin
+  jp: Joseph Pirtle
+  ao: Adekunle Oduye
+  kg: Kellye Greene
+  mc2: Micah Corn
+  ms: Matt Salerno
+  fb: Francesco Bertocci
+  co: Cathy O
 email:
   prefix: zephyr-eng
   domain: gust.com

data/Gemfile.lock

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

data/integration/controllers/posts_controller_spec.rb

@@ -21,7 +21,20 @@ describe PostsController do
     end
   end
 
-  context "stubbing with incorrect matchers" do
+  context "stub load resource with a singleton" do
+    let_double(:post)
+
+    before do
+      stub_load_singleton_resource(:post) { post }
+    end
+
+    it "uses the stub" do
+      get :index
+      assigns(:post).should == post
+    end
+  end
+
+  context "stubbing with load_and_authorize_resource incorrect matchers" do
     let_double(:article)
 
     before do
@@ -42,4 +55,26 @@ describe PostsController do
       end
     end
   end
+
+  context "stubbing load resource with incorrect matchers" do
+    let_double(:post)
+
+    before do
+      stub_load_singleton_resource(:author, instance_method: :i_am_not_right) { post }
+    end
+
+    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_resource :post'")
+        get :index
+      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_resource :post'")
+        get :index
+      end
+    end
+  end
 end

data/integration/fixtures/dummy/app/controllers/posts_controller.rb

@@ -1,8 +1,11 @@
 class PostsController < ApplicationController
-  load_and_authorize_resource :post
+  load_and_authorize_resource :post, except: [:index]
+  load_resource :post, only: [:index]
 
   def create
     render :index
   end
 
+  def index
+  end
 end

data/lib/cancan_unit_test/cancan/controller_resource.rb

@@ -16,8 +16,9 @@ module CancanUnitTest
 
       def _shim_load_and_authorize_resource
         model_name = resource_class.model_name.underscore
+        method_name = :load_and_authorize_resource
 
-        stub_finder = StubFinder.new(@controller, :load_and_authorize_resource)
+        stub_finder = StubFinder.new(@controller, method_name)
 
         singleton_stub = stub_finder.find_by_singleton(model_name.to_sym, @options)
         collection_stub = stub_finder.find_by_collection(model_name.to_sym, @options)
@@ -26,20 +27,40 @@ module CancanUnitTest
           self.resource_instance = singleton_stub.call if singleton_stub
           self.collection_instance = collection_stub.call if collection_stub
         else
-          warn_about_missing_stub(model_name) if ControllerResource.show_warnings
+          warn_about_missing_stub(model_name, method_name) if ControllerResource.show_warnings
           _original_load_and_authorize_resource
         end
       end
 
+      def _shim_load_resource
+        model_name = resource_class.model_name.underscore
+        method_name = :load_resource
+
+        stub_finder = StubFinder.new(@controller, method_name)
+
+        singleton_stub = stub_finder.find_by_singleton(model_name.to_sym, @options)
+
+        if singleton_stub
+          self.resource_instance = singleton_stub.call if singleton_stub
+        else
+          warn_about_missing_stub(model_name, method_name) if ControllerResource.show_warnings
+          _original_load_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}'")
+      def warn_about_missing_stub(model_name, method)
+        puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for '#{method} :#{model_name}'")
+        ControllerResource.show_warnings = false
       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
+
+        alias_method :_original_load_resource, :load_resource
+        alias_method :load_resource, :_shim_load_resource
       end
     end
   end

data/lib/cancan_unit_test/mocks.rb

@@ -9,6 +9,10 @@ module CancanUnitTest
       controller._add_cancan_unit_test_stub(:load_and_authorize_resource, :collection, model, options, &block)
     end
 
+    def stub_load_singleton_resource(model, options={}, &block)
+      controller._add_cancan_unit_test_stub(:load_resource, :singleton, model, options, &block)
+    end
+
     RSpec.configure do |config|
       config.before(:each, cancan_unit_test_warning: true) do
         CancanUnitTest::CanCan::ControllerResource.show_warnings = true

data/lib/cancan_unit_test/version.rb

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

data/spec/cancan/controller_resource_spec.rb

@@ -19,6 +19,10 @@ module CancanUnitTest
           raise "original called"
         end
 
+        def load_resource
+          raise "original called"
+        end
+
         def resource_class
           OpenStruct.new({ model_name: @model_name })
         end
@@ -105,6 +109,69 @@ module CancanUnitTest
           end
         end
       end
+
+      describe "#load_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_resource) { stub_finder }
+          stub_finder.stub(:find_by_singleton).with(:the_model_name, options) { singleton_results }
+        end
+
+        context "when a stub doesn't exist for the resource" do
+          let(:singleton_results) { nil }
+
+          it "calls through to the original method" do
+            expect { controller_resource.load_resource }.to raise_error "original called"
+          end
+
+          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_resource :the_model_name'")
+              begin
+                controller_resource.load_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_resource :the_model_name'")
+              begin
+                controller_resource.load_resource
+              rescue
+              end
+            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_resource
+          end
+
+          it "assigns the stub to resource_instance" do
+            controller_resource.should_receive(:resource_instance=).with(block_result)
+            controller_resource.load_resource
+          end
+        end
+      end
     end
   end
 end

data/spec/mocks_spec.rb

@@ -47,6 +47,16 @@ module CancanUnitTest
           stub_load_and_authorize_collection_resource(:model, options, &block)
       end
     end
+
+    describe "#stub_load_singleton_resource" do
+      it "adds the stubbed singleton resource to the controller" do
+        controller.should_receive(:_add_cancan_unit_test_stub).
+          with(:load_resource, :singleton, :model, options, &block)
+
+        rspec_test.
+          stub_load_singleton_resource(:model, options, &block)
+      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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Todd Mohney, Rasheed Abdul-Aziz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan