haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9355 from briancain/fix-sticky-travis-test 

Fix sticky Travis CI test
This commit is contained in:
Brian Cain 2018-01-10 09:55:24 -08:00 committed by GitHub
parent 5c7cd8f300 bf4ea4e76c
commit 12d4f4eb6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/vagrant/action/builtin/box_add_test.rb
View File

@ -283,7 +283,7 @@ describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
context "with a box name accidentally set as a URL" do context "with a box name accidentally set as a URL" do
it "displays a warning to the user" do it "displays a warning to the user" do
box_path = iso_env.box2_file(:virtualbox) box_path = iso_env.box2_file(:virtualbox)
with_web_server(box_path) do |port| port = 9999
box_url_name = "http://127.0.0.1:#{port}/#{box_path.basename}" box_url_name = "http://127.0.0.1:#{port}/#{box_path.basename}"
env[:box_name] = box_url_name env[:box_name] = box_url_name
@ -303,13 +303,10 @@ describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
subject.call(env) subject.call(env)
end end
end end
end
context "with a box name containing invalid URI characters" do context "with a box name containing invalid URI characters" do
it "should not raise an error" do it "should not raise an error" do
box_path = iso_env.box2_file(:virtualbox) box_path = iso_env.box2_file(:virtualbox)
with_web_server(box_path) do |port|
box_url_name = "box name with spaces" box_url_name = "box name with spaces"
env[:box_name] = box_url_name env[:box_name] = box_url_name
@ -325,7 +322,6 @@ describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
subject.call(env) subject.call(env)
end end
end end
end
context "with URL containing credentials" do context "with URL containing credentials" do
let(:username){ "box-username" } let(:username){ "box-username" }