test: fix tests using badge service

solarmosaic-kflorence · Sep 17, 2017 · cb6cb8e · cb6cb8e
1 parent 2453c55
commit cb6cb8e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/lib/pact_broker/badges/cached_service.rb b/lib/pact_broker/badges/cached_service.rb
@@ -17,10 +17,15 @@ def pact_verification_badge pact, label, initials, verification_status
         CACHE[badge_key] ||= PactBroker::Badges::Service.pact_verification_badge(pact, label, initials, verification_status)
       end
 
+      def clear_cache
+        CACHE.clear
+      end
+
       private
 
       def key pact, label, initials, verification_status
-        "#{pact.consumer.name}-#{pact.provider.name}-#{label}-#{initials}-#{verification_status}"
+        pact_name = pact ? "#{pact.consumer.name}-#{pact.provider.name}" : "nil"
+        "#{pact_name}-#{label}-#{initials}-#{verification_status}"
       end
     end
   end

diff --git a/spec/lib/pact_broker/api/resources/badge_spec.rb b/spec/lib/pact_broker/api/resources/badge_spec.rb
@@ -1,5 +1,5 @@
 require 'pact_broker/api/resources/badge'
-require 'pact_broker/badges/service'
+require 'pact_broker/badges/cached_service'
 
 module PactBroker
   module Api
@@ -11,7 +11,7 @@ module Resources
         before do
           allow(PactBroker::Pacts::Service).to receive(:find_latest_pact).and_return(pact)
           allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for).and_return(verification)
-          allow(PactBroker::Badges::Service).to receive(:pact_verification_badge).and_return("badge")
+          allow(PactBroker::Badges::CachedService).to receive(:pact_verification_badge).and_return("badge")
           allow(PactBroker::Verifications::Status).to receive(:new).and_return(verification_status)
         end
 
@@ -68,7 +68,7 @@ module Resources
           end
 
           it "creates a badge" do
-            expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(pact, nil, false, :verified)
+            expect(PactBroker::Badges::CachedService).to receive(:pact_verification_badge).with(pact, nil, false, :verified)
             subject
           end
 
@@ -84,7 +84,7 @@ module Resources
             let(:params) { {label: 'consumer'} }
 
             it "creates a badge with the specified label" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, 'consumer', anything, anything)
+              expect(PactBroker::Badges::CachedService).to receive(:pact_verification_badge).with(anything, 'consumer', anything, anything)
               subject
             end
           end
@@ -93,7 +93,7 @@ module Resources
             let(:params) { {initials: 'true'} }
 
             it "creates a badge with initials" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, anything, true, anything)
+              expect(PactBroker::Badges::CachedService).to receive(:pact_verification_badge).with(anything, anything, true, anything)
               subject
             end
           end

diff --git a/spec/lib/pact_broker/badges/cached_service_spec.rb b/spec/lib/pact_broker/badges/cached_service_spec.rb
@@ -16,7 +16,6 @@ module Badges
 
         before do
           allow(Service).to receive(:pact_verification_badge).and_return('badge')
-          stub_const('PactBroker::Badges::CachedService::CACHE', {})
         end
 
         subject { CachedService.pact_verification_badge pact, label, initials, verification_status  }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -23,6 +23,8 @@
 
   config.before :each do
     PactBroker.reset_configuration
+    require 'pact_broker/badges/cached_service'
+    PactBroker::Badges::CachedService.clear_cache
   end
 
   config.include Rack::Test::Methods