refactor: put database connector on rack env

pact-foundation · May 22, 2019 · 9f635c3 · 9f635c3
1 parent 931079d
commit 9f635c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/rack/pact_broker/database_transaction.rb b/lib/rack/pact_broker/database_transaction.rb
@@ -22,14 +22,18 @@ def initialize app, database_connection
       def call env
         set_database_connector
         if use_transaction? env
-          call_with_transaction env
+          call_with_transaction(add_database_connector(env))
         else
-          call_without_transaction env
+          call_without_transaction(add_database_connector(env))
         end
       ensure
         clear_database_connector
       end
 
+      def add_database_connector(env)
+        env.merge("pactbroker.database_connector" => @default_database_connector)
+      end
+
       def use_transaction? env
         TRANS_METHODS.include? env[REQUEST_METHOD]
       end

diff --git a/spec/lib/rack/pact_broker/database_transaction_spec.rb b/spec/lib/rack/pact_broker/database_transaction_spec.rb
@@ -25,6 +25,16 @@ module PactBroker
 
       subject { self.send(http_method, "/") }
 
+      it "sets the pactbroker.database_connector on the env" do
+        actual_env = nil
+        allow(api).to receive(:call) do | env |
+          actual_env = env
+          [200, {}, {}]
+        end
+        subject
+        expect(actual_env).to have_key("pactbroker.database_connector")
+      end
+
       context "for get requests" do
         let(:http_method) { :get }