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

Update Atlas Push to use new vagrant-login API

This commit is contained in:
Seth Vargo 2014-12-10 15:11:04 -08:00
parent 7d6a6cd263
commit 0506e17778
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/pushes/atlas/config.rb
View File

@ -85,7 +85,7 @@ module VagrantPlugins
errors = _detected_errors
if missing?(@token)
token = token_from_vagrant_login(machine.env) || ENV["ATLAS_TOKEN"]
token = token_from_vagrant_login(machine.env)
if missing?(token)
errors << I18n.t("atlas_push.errors.missing_token")
else

32
test/unit/plugins/pushes/atlas/config_test.rb
View File

@ -73,13 +73,9 @@ describe VagrantPlugins::AtlasPush::Config do
before do
allow(subject).to receive(:token_from_vagrant_login)
.and_return("token_from_vagrant_login")
allow(ENV).to receive(:[]).and_call_original
allow(ENV).to receive(:[])
.with("ATLAS_TOKEN").and_return("token_from_env")
end
it "uses the token in the Vagrantfile" do
it "uses the token from vagrant-login" do
subject.token = ""
subject.finalize!
expect(errors).to be_empty
@ -87,32 +83,10 @@ describe VagrantPlugins::AtlasPush::Config do
end
end
context "when ATLAS_TOKEN is set in the environment" do
before do
allow(subject).to receive(:token_from_vagrant_login)
.and_return(nil)
allow(ENV).to receive(:[]).and_call_original
allow(ENV).to receive(:[])
.with("ATLAS_TOKEN").and_return("token_from_env")
end
it "uses the token in the environment" do
subject.token = ""
subject.finalize!
expect(errors).to be_empty
expect(subject.token).to eq("token_from_env")
end
end
context "when a token is given in the Vagrantfile" do
before do
allow(subject).to receive(:token_from_vagrant_login)
.and_return("token_from_vagrant_login")
allow(ENV).to receive(:[]).and_call_original
allow(ENV).to receive(:[])
.with("ATLAS_TOKEN").and_return("token_from_env")
end
it "uses the token in the Vagrantfile" do
@ -127,10 +101,6 @@ describe VagrantPlugins::AtlasPush::Config do
before do
allow(subject).to receive(:token_from_vagrant_login)
.and_return(nil)
allow(ENV).to receive(:[]).and_call_original
allow(ENV).to receive(:[])
.with("ATLAS_TOKEN").and_return(nil)
end
it "returns an error" do