vagrant-windows-domain 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4d4875a6881aa9302b991ca98ca530ba0c2387
-  data.tar.gz: b43d80f3309032da02801d7ca249cc4b08671743
+  metadata.gz: 6cec07d512096a25b4795721fc93e328fe27d5cd
+  data.tar.gz: 78e9f4ee8d880ad7c92125329f0e7cff36006d52
 SHA512:
-  metadata.gz: 59121ad5e5524c081892f311c7a515443fd22520c906bff36dc027e00f0bb1f01e1e9e0aa42f7c65056c286401f294fdf7375ed3bbb0fde6985c397f95b81476
-  data.tar.gz: 8646823778f6fb96f14b0425908fdadcbfb0e8cf111ca9a2ca86eb905fef9d5b321e86e792fc5f2f7ae78862befb2f0b1b9cba416de56a45f6f882789c6a123c
+  metadata.gz: 64dc44b47c9cc66955f78064eb637a87745a501497c8ed6ef72df5edaf761352861e2c17bf4f643dfcc08ce170f1869fdf3d66b74d0ea5e88823efefb8666570
+  data.tar.gz: fc7cf4dc6056c95465635ed4f2c0daaacc2f7dcce3b5f66aa7c0ad17795afa620f7f73696cb12692864db94a91c4c8cdc2499ebfe368b50d109e099487362c8c

data/lib/vagrant-windows-domain/action/leave_domain.rb

@@ -46,11 +46,11 @@ module VagrantPlugins
        	    @logger.debug("Machine not created, nothing to do")
        	  elsif [:running].include? @machine.state.id
        	    answer = @machine.env.ui.ask("Are you sure you want to destroy this machine and disconnect from #{@config.domain}? (y/n)")
-       	    if answer.downcase == 'y'
-       	    	env[:force_confirm_destroy] = true # Prevent the popup dialog again
-       	    	@logger.debug("Valid configuration detected, triggering leave domain action")
-       	    	@provisioner.destroy
-       	    end
+            return unless answer.downcase == 'y' # Bail out of destroy and prevent middleware from continuing on
+
+env[:force_confirm_destroy] = true # Prevent the popup dialog again
+@logger.debug("Valid configuration detected, triggering leave domain action")
+@provisioner.destroy
        	  else
        	    @machine.env.ui.say(:warn, "Machine is currently not running. To properly leave the #{@config.domain} network the machine needs to be running and connected to the network in which it was provisioned. Please run `vagrant up` and then `vagrant destroy`.\n")
        	    answer = @machine.env.ui.ask("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{@config.domain}' network? (y/n)")

data/lib/vagrant-windows-domain/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.1.8"
+    VERSION = "1.1.9"
   end
 end

data/spec/provisioner/leave_domain_spec.rb

@@ -60,6 +60,17 @@ describe VagrantPlugins::WindowsDomain::LeaveDomain do
 			subject.call(env)
 
 		end
+
+		it "should not continue if the user declines to destroy the machine" do
+			state = double("state", id: :running)
+			expect(provisioner).to_not receive(:destroy)
+
+            expect(ui).to receive(:ask).with("Are you sure you want to destroy this machine and disconnect from #{domain}? (y/n)").and_return("n")
+            expect(machine).to receive(:state).and_return(state).twice
+            expect(app).to_not receive(:call).with(env)
+            subject.call(env)
+
+		end
   	end
 
   	context "when machine is :paused, :saved or :poweroff" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Matt Fellows