test/unit/vagrant/action/builtin/box_add_test.rb in vagrant-unbundled-1.9.7.1 vs test/unit/vagrant/action/builtin/box_add_test.rb in vagrant-unbundled-1.9.8.1

@@ -79,21 +79,21 @@
     server.shutdown rescue nil
     thr.join rescue nil
   end
 
   before do
-    box_collection.stub(find: nil)
+    allow(box_collection).to receive(:find).and_return(nil)
   end
 
   context "with box file directly" do
     it "adds it" do
       box_path = iso_env.box2_file(:virtualbox)
 
       env[:box_name] = "foo"
       env[:box_url] = box_path.to_s
 
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo")
         expect(version).to eq("0")
         expect(opts[:metadata_url]).to be_nil
         true
@@ -111,11 +111,11 @@
       env[:box_url] = [
         "/foo/bar/baz",
         box_path.to_s,
       ]
 
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo")
         expect(version).to eq("0")
         expect(opts[:metadata_url]).to be_nil
         true
@@ -130,11 +130,11 @@
       box_path = iso_env.box2_file(:virtualbox)
       with_web_server(box_path) do |port|
         env[:box_name] = "foo"
         env[:box_url] = "http://127.0.0.1:#{port}/#{box_path.basename}"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(checksum(path)).to eq(checksum(box_path))
           expect(name).to eq("foo")
           expect(version).to eq("0")
           expect(opts[:metadata_url]).to be_nil
           true
@@ -150,11 +150,11 @@
       box_path = iso_env.box2_file(:virtualbox)
       with_ftp_server(box_path) do |port|
         env[:box_name] = "foo"
         env[:box_url] = "ftp://127.0.0.1:#{port}/#{box_path.basename}"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(checksum(path)).to eq(checksum(box_path))
           expect(name).to eq("foo")
           expect(version).to eq("0")
           expect(opts[:metadata_url]).to be_nil
           true
@@ -265,12 +265,12 @@
       env[:box_force] = true
       env[:box_name] = "foo"
       env[:box_url] = box_path.to_s
       env[:box_provider] = "virtualbox"
 
-      box_collection.stub(find: box)
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      allow(box_collection).to receive(:find).and_return(box)
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo")
         expect(version).to eq("0")
         expect(opts[:metadata_url]).to be_nil
         true
@@ -286,11 +286,11 @@
         with_web_server(box_path) do |port|
 
           box_url_name = "http://127.0.0.1:#{port}/#{box_path.basename}"
           env[:box_name] = box_url_name
 
-          expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+          expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
             expect(name).to eq(box_url_name)
             expect(version).to eq("0")
             expect(opts[:metadata_url]).to be_nil
             true
           }.and_return(box)
@@ -311,11 +311,11 @@
         with_web_server(box_path) do |port|
 
           box_url_name = "box name with spaces"
           env[:box_name] = box_url_name
 
-          expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+          expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
             expect(name).to eq(box_url_name)
             expect(version).to eq("0")
             expect(opts[:metadata_url]).to be_nil
             true
           }.and_return(box)
@@ -335,11 +335,11 @@
         box_path = iso_env.box2_file(:virtualbox)
         with_web_server(box_path) do |port|
           env[:box_name] = "foo"
           env[:box_url] = "http://#{username}:#{password}@127.0.0.1:#{port}/#{box_path.basename}"
 
-          expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+          expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
             expect(checksum(path)).to eq(checksum(box_path))
             expect(name).to eq("foo")
             expect(version).to eq("0")
             expect(opts[:metadata_url]).to be_nil
             true
@@ -383,11 +383,11 @@
 
       md_path = Pathname.new(tf.path)
       with_web_server(md_path) do |port|
         env[:box_url] = "http://127.0.0.1:#{port}/#{md_path.basename}"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("foo/bar")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq(env[:box_url])
           true
@@ -428,11 +428,11 @@
 
       md_path = Pathname.new(tf.path)
       with_web_server(md_path, **opts) do |port|
         env[:box_url] = "http://127.0.0.1:#{port}/#{md_path.basename}"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("foo/bar")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq(env[:box_url])
           true
@@ -473,11 +473,11 @@
 
       with_web_server(tf.dirname) do |port|
         url = "http://127.0.0.1:#{port}"
         env[:box_url] = "mitchellh/precise64.json"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("mitchellh/precise64")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq(
             "#{url}/#{env[:box_url]}")
@@ -524,11 +524,11 @@
       with_web_server(tf.dirname) do |port|
         url = "http://127.0.0.1:#{port}"
         env[:box_url] = "mitchellh/precise64.json"
         env[:box_server_url] = url
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("mitchellh/precise64")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq(
             "#{url}/#{env[:box_url]}")
@@ -585,11 +585,11 @@
           else
             raise "UNKNOWN: #{opts[:box_urls].inspect}"
           end
         end
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("foo/bar")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq("foo")
           true
@@ -630,11 +630,11 @@
 
       md_path = Pathname.new(tf.path)
       with_web_server(md_path) do |port|
         env[:box_url] = "http://127.0.0.1:#{port}/#{md_path.basename}"
 
-        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+        expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
           expect(name).to eq("foo/bar")
           expect(version).to eq("0.7")
           expect(checksum(path)).to eq(checksum(box_path))
           expect(opts[:metadata_url]).to eq(env[:box_url])
           true
@@ -689,11 +689,11 @@
       env[:box_url] = "mitchellh/precise64.json"
 
       expect(box_collection).to receive(:add).never
       expect(app).to receive(:call).never
 
-      Vagrant.stub(server_url: nil)
+      allow(Vagrant).to receive(:server_url).and_return(nil)
 
       expect { subject.call(env) }.
         to raise_error(Vagrant::Errors::BoxServerNotSet)
     end
 
@@ -774,11 +774,11 @@
         RAW
         f.close
       end
 
       env[:box_url] = tf.path
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -818,11 +818,11 @@
         f.close
       end
 
       env[:box_url] = tf.path
       env[:box_provider] = "vmware"
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -867,11 +867,11 @@
         f.close
       end
 
       env[:box_url] = tf.path
       env[:box_provider] = "vmware"
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -907,11 +907,11 @@
         f.close
       end
 
       env[:box_url] = tf.path
       env[:box_version] = "~> 0.1"
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.5")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -952,11 +952,11 @@
       end
 
       env[:box_url] = tf.path
       env[:box_provider] = "vmware"
       env[:box_version] = "~> 0.1"
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.5")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -1000,11 +1000,11 @@
         f.close
       end
 
       env[:box_url] = tf.path
       env[:box_provider] = ["virtualbox", "vmware"]
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -1048,11 +1048,11 @@
 
       env[:box_url] = tf.path
 
       expect(env[:ui]).to receive(:ask).and_return("1")
 
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
@@ -1223,15 +1223,15 @@
         f.close
       end
 
       env[:box_force] = true
       env[:box_url] = tf.path
-      box_collection.stub(find: box)
-      expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+      allow(box_collection).to receive(:find).and_return(box)
+      expect(box_collection).to receive(:add).with(any_args) { |path, name, version, **opts|
         expect(checksum(path)).to eq(checksum(box_path))
         expect(name).to eq("foo/bar")
         expect(version).to eq("0.7")
-        expect(opts[:force]).to be_true
+        expect(opts[:force]).to be(true)
         expect(opts[:metadata_url]).to eq("file://#{tf.path}")
         true
       }.and_return(box)
 
       expect(app).to receive(:call).with(env)