[NEP-9115] Upgrade to Apartment 2 causes Patches to Fail (#24)

* [NEP-9115] Upgrade to Apartment 2 causes Patches to Fail * [NEP-9115] replaces switch! with a block
rdytech · Nov 24, 2019 · febf6fc · febf6fc
1 parent 0945f88
commit febf6fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bin/console b/bin/console
diff --git a/lib/patches/tenant_run_concern.rb b/lib/patches/tenant_run_concern.rb
@@ -1,8 +1,9 @@
 module Patches
   module TenantRunConcern
     def run(tenant_name, path = nil)
-      Apartment::Tenant.switch(tenant_name)
-      Patches::Runner.new(path).perform
+      Apartment::Tenant.switch(tenant_name) do
+        Patches::Runner.new(path).perform
+      end
     end
   end
 end
diff --git a/lib/patches/version.rb b/lib/patches/version.rb
@@ -1,3 +1,6 @@
 module Patches
-  VERSION = "3.0.1"
+  MAJOR = 3
+  MINOR = 1
+  PATCH = 0
+  VERSION = [MAJOR, MINOR, PATCH].compact.join(".").freeze
 end
diff --git a/spec/tenant_run_concern_spec.rb b/spec/tenant_run_concern_spec.rb
@@ -19,9 +19,9 @@ class DummyRun
 
   describe '#run' do
     it 'calls instance perform' do
-      expect(Apartment::Tenant).to receive(:switch).with('test')
-      expect(Patches::Runner).to receive(:new).with('path').and_return(runner)
       expect(runner).to receive(:perform)
+      expect(Patches::Runner).to receive(:new).with('path').and_return(runner)
+      expect(Apartment::Tenant).to receive(:switch).with('test').and_yield
       subject.run('test', 'path')
     end
   end