dpl 1.6.1.travis.447.1 → 1.6.1.travis.449.1

data/spec/provider/deis_spec.rb

@@ -10,13 +10,13 @@ describe DPL::Provider::Deis do
                                           :password => 'secret')
   end
 
-  describe :needs_key? do
+  describe "#needs_key?" do
     example do
       expect(provider.needs_key?).to eq(true)
     end
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     example do
       expect(provider.context).to receive(:shell).with(
         'deis login http://deis.deisapps.com --username=travis --password=secret'
@@ -25,7 +25,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :check_app do
+  describe "#check_app" do
     example do
       expect(provider.context).to receive(:shell).with(
         'deis apps:info --app=example'
@@ -34,7 +34,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :setup_key do
+  describe "#setup_key" do
     let(:ssh_config_handle) { double 'ssh_config_handle' }
     let(:ssh_config) { File.join(Dir.home, '.ssh', 'config') }
     let(:identity_file) { File.join(Dir.pwd, 'key_file') }
@@ -46,7 +46,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :setup_git_ssh do
+  describe "#setup_git_ssh" do
     let(:ssh_config_handle) { double 'ssh_config_handle' }
     let(:ssh_config) { File.join(Dir.home, '.ssh', 'config') }
     let(:identity_file) { File.join(Dir.pwd, 'key_file') }
@@ -69,7 +69,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :remove_key do
+  describe "#remove_key" do
     example do
       expect(provider.context).to receive(:shell).with(
         'deis keys:remove key'
@@ -78,7 +78,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
         'git push deis-repo:example.git HEAD:refs/heads/master -f'
@@ -87,7 +87,7 @@ describe DPL::Provider::Deis do
     end
   end
 
-  describe :run do
+  describe "#run" do
     example do
       expect(provider.context).to receive(:shell).with(
         'deis apps:run shell command'

data/spec/provider/divshot_spec.rb

@@ -6,22 +6,22 @@ describe DPL::Provider::Divshot do
     described_class.new DummyContext.new, :api_key => 'abc123'
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     it 'should require an api key' do
       provider.options.update(:api_key => nil)
       expect{ provider.check_auth }.to raise_error("must supply an api key")
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     it 'should include the environment specified' do
       provider.options.update(:environment => 'development')
-      provider.context.should_receive(:shell).with("divshot push development --token abc123")
+      expect(provider.context).to receive(:shell).with("divshot push development --token abc123")
       provider.push_app
     end
 
     it 'should default to production' do
-      provider.context.should_receive(:shell).with("divshot push production --token abc123")
+      expect(provider.context).to receive(:shell).with("divshot push production --token abc123")
       provider.push_app
     end
   end

data/spec/provider/dotcloud_spec.rb

@@ -6,36 +6,36 @@ describe DPL::Provider::DotCloud do
     described_class.new(DummyContext.new, :app => 'example', :api_key => 'foo')
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     example do
-      provider.context.should_receive(:shell).with("echo foo | dotcloud setup --api-key")
+      expect(provider.context).to receive(:shell).with("echo foo | dotcloud setup --api-key")
       provider.check_auth
     end
   end
 
-  describe :check_app do
+  describe "#check_app" do
     example do
-      provider.context.should_receive(:shell).with("dotcloud connect example")
+      expect(provider.context).to receive(:shell).with("dotcloud connect example")
       provider.check_app
     end
   end
 
-  describe :needs_key? do
+  describe "#needs_key?" do
     example do
-      provider.needs_key?.should == false
+      expect(provider.needs_key?).to eq(false)
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     example do
-      provider.context.should_receive(:shell).with("dotcloud push example")
+      expect(provider.context).to receive(:shell).with("dotcloud push example")
       provider.push_app
     end
   end
 
-  describe :run do
+  describe "#run" do
     example do
-      provider.context.should_receive(:shell).with("dotcloud -A example www test")
+      expect(provider.context).to receive(:shell).with("dotcloud -A example www test")
       provider.run("test")
     end
   end

data/spec/provider/hackage_spec.rb

@@ -6,7 +6,7 @@ describe DPL::Provider::Hackage do
     described_class.new(DummyContext.new, :username => 'FooUser', :password => 'bar')
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     it 'should require username' do
       provider.options.update(:username => nil)
       expect {
@@ -22,25 +22,25 @@ describe DPL::Provider::Hackage do
     end
   end
 
-  describe :check_app do
+  describe "#check_app" do
     it 'calls cabal' do
-      provider.context.should_receive(:shell).with("cabal check").and_return(true)
+      expect(provider.context).to receive(:shell).with("cabal check").and_return(true)
       provider.check_app
     end
 
     it 'fails when cabal complains' do
-      provider.context.should_receive(:shell).with("cabal check").and_return(false)
+      expect(provider.context).to receive(:shell).with("cabal check").and_return(false)
       expect {
         provider.check_app
       }.to raise_error(DPL::Error)
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     example do
-      provider.context.should_receive(:shell).with("cabal sdist").and_return(true)
-      Dir.should_receive(:glob).and_yield('dist/package-0.1.2.3.tar.gz')
-      provider.context.should_receive(:shell).with("cabal upload --username=FooUser --password=bar dist/package-0.1.2.3.tar.gz")
+      expect(provider.context).to receive(:shell).with("cabal sdist").and_return(true)
+      expect(Dir).to receive(:glob).and_yield('dist/package-0.1.2.3.tar.gz')
+      expect(provider.context).to receive(:shell).with("cabal upload --username=FooUser --password=bar dist/package-0.1.2.3.tar.gz")
       provider.push_app
     end
   end

data/spec/provider/heroku_anvil_spec.rb

@@ -9,15 +9,15 @@ describe DPL::Provider::Heroku do
     described_class.new(DummyContext.new, :app => 'example', :api_key => 'foo', :strategy => 'anvil', :buildpack => 'git://some-buildpack.git')
   end
 
-  describe :api do
+  describe "#api" do
     it 'accepts an api key' do
       api = double(:api)
-      lambda { provider.api }.should_not raise_error
+      expect { provider.api }.not_to raise_error
     end
 
     it 'raises an error if an api key is not present' do
       provider.options.delete :api_key
-      lambda { provider.api }.should raise_error(DPL::Error)
+      expect { provider.api }.to raise_error(DPL::Error)
     end
   end
 
@@ -29,49 +29,49 @@ describe DPL::Provider::Heroku do
     end
 
     before do
-      ::Heroku::API.should_receive(:new).and_return(api)
+      expect(::Heroku::API).to receive(:new).and_return(api)
       provider.api
     end
 
-    describe :push_app do
+    describe "#push_app" do
       example do
         response = double :response
-        response.stub(:status => 202)
-        response.stub(:headers => {'Location' => '/blah'})
+        allow(response).to receive_messages(:status => 202)
+        allow(response).to receive_messages(:headers => {'Location' => '/blah'})
 
         second_response = double :second_response
-        second_response.stub(:status => 200)
+        allow(second_response).to receive_messages(:status => 200)
 
-        provider.stub(:slug_url => "http://slug-url")
+        allow(provider).to receive_messages(:slug_url => "http://slug-url")
 
-        ENV.should_receive(:[]).with('TRAVIS_COMMIT').and_return('123')
-        ::Excon.should_receive(:post).with(provider.release_url,
+        expect(ENV).to receive(:[]).with('TRAVIS_COMMIT').and_return('123')
+        expect(::Excon).to receive(:post).with(provider.release_url,
                                         :body => {"slug_url" => "http://slug-url", "description" => "Deploy 123 via Travis CI" }.to_json,
                                          :headers => {"Content-Type" => 'application/json', 'Accept' => 'application/json'}).and_return(response)
 
-        ::Excon.should_receive(:get).with("https://:#{provider.options[:api_key]}@cisaurus.heroku.com/blah").and_return(second_response)
+        expect(::Excon).to receive(:get).with("https://:#{provider.options[:api_key]}@cisaurus.heroku.com/blah").and_return(second_response)
         provider.push_app
       end
     end
 
-    describe :slug_url do
+    describe "#slug_url" do
 
       before(:each) do
         headers = double(:headers)
-        ::Anvil.should_receive(:headers).at_least(:twice).and_return(headers)
-        headers.should_receive(:[]=).at_least(:once).with('X-Heroku-User', "foo@bar.com")
-        headers.should_receive(:[]=).at_least(:once).with('X-Heroku-App', "example")
+        expect(::Anvil).to receive(:headers).at_least(:twice).and_return(headers)
+        expect(headers).to receive(:[]=).at_least(:once).with('X-Heroku-User', "foo@bar.com")
+        expect(headers).to receive(:[]=).at_least(:once).with('X-Heroku-App', "example")
       end
 
       example "with full buildpack url" do
-        ::Anvil::Engine.should_receive(:build).with(".", :buildpack=>"git://some-buildpack.git")
+        expect(::Anvil::Engine).to receive(:build).with(".", :buildpack=>"git://some-buildpack.git")
         provider.slug_url
       end
 
       example "with buildpack name expansion" do
         DPL::Provider::Heroku::Anvil::HEROKU_BUILDPACKS.each do |b|
           provider.options.update(:buildpack => b)
-          ::Anvil::Engine.should_receive(:build).with(".", :buildpack=>described_class::Anvil::HEROKU_BUILDPACK_PREFIX + b + ".git")
+          expect(::Anvil::Engine).to receive(:build).with(".", :buildpack=>described_class::Anvil::HEROKU_BUILDPACK_PREFIX + b + ".git")
           provider.slug_url
         end
       end

data/spec/provider/heroku_git_deploy_key_spec.rb

@@ -7,9 +7,9 @@ describe DPL::Provider::Heroku do
     described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "gitdeploykey")
   end
 
-  describe :ssh do
+  describe "#ssh" do
     it "doesn't require an ssh key" do
-      provider.needs_key?.should == false
+      expect(provider.needs_key?).to eq(false)
     end
   end
 end

data/spec/provider/heroku_git_spec.rb

@@ -7,18 +7,18 @@ describe DPL::Provider::Heroku do
     described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "git")
   end
 
-  describe :api do
+  describe "#api" do
     it 'accepts an api key' do
       api = double(:api)
-      ::Heroku::API.should_receive(:new).with(:api_key => "foo").and_return(api)
-      provider.api.should be == api
+      expect(::Heroku::API).to receive(:new).with(:api_key => "foo").and_return(api)
+      expect(provider.api).to eq(api)
     end
 
     it 'accepts a user and a password' do
       api = double(:api)
       provider.options.update(:user => "foo", :password => "bar")
-      ::Heroku::API.should_receive(:new).with(:user => "foo", :password => "bar").and_return(api)
-      provider.api.should be == api
+      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar").and_return(api)
+      expect(provider.api).to eq(api)
     end
   end
 
@@ -30,74 +30,74 @@ describe DPL::Provider::Heroku do
     end
 
     before do
-      ::Heroku::API.should_receive(:new).and_return(api)
+      expect(::Heroku::API).to receive(:new).and_return(api)
       provider.api
     end
 
     its(:api) { should be == api }
 
-    describe :check_auth do
+    describe "#check_auth" do
       example do
-        provider.should_receive(:log).with("authenticated as foo@bar.com")
+        expect(provider).to receive(:log).with("authenticated as foo@bar.com")
         provider.check_auth
       end
     end
 
-    describe :check_app do
+    describe "#check_app" do
       example do
-        provider.should_receive(:log).at_least(1).times.with(/example/)
+        expect(provider).to receive(:log).at_least(1).times.with(/example/)
         provider.check_app
-        provider.options[:git].should be == "GIT URL"
+        expect(provider.options[:git]).to eq("GIT URL")
       end
     end
 
-    describe :setup_key do
+    describe "#setup_key" do
       example do
-        File.should_receive(:read).with("the file").and_return("foo")
-        api.should_receive(:post_key).with("foo")
+        expect(File).to receive(:read).with("the file").and_return("foo")
+        expect(api).to receive(:post_key).with("foo")
         provider.setup_key("the file")
       end
     end
 
-    describe :remove_key do
+    describe "#remove_key" do
       example do
-        api.should_receive(:delete_key).with("key")
+        expect(api).to receive(:delete_key).with("key")
         provider.remove_key
       end
     end
 
-    describe :push_app do
+    describe "#push_app" do
       example do
         provider.options[:git] = "git://something"
-        provider.context.should_receive(:shell).with("git push git://something HEAD:refs/heads/master -f")
+        expect(provider.context).to receive(:shell).with("git push git://something HEAD:refs/heads/master -f")
         provider.push_app
       end
     end
 
-    describe :run do
+    describe "#run" do
       example do
         data = double("data", :body => { "rendezvous_url" => "rendezvous url" })
-        api.should_receive(:post_ps).with("example", "that command", :attach => true).and_return(data)
-        Rendezvous.should_receive(:start).with(:url => "rendezvous url")
+        expect(api).to receive(:post_ps).with("example", "that command", :attach => true).and_return(data)
+        expect(Rendezvous).to receive(:start).with(:url => "rendezvous url")
         provider.run("that command")
       end
     end
 
-    describe :restart do
+    describe "#restart" do
       example do
-        api.should_receive(:post_ps_restart).with("example")
+        expect(api).to receive(:post_ps_restart).with("example")
         provider.restart
       end
     end
 
-    describe :deploy do
+    describe "#deploy" do
       example "not found error" do
-        provider.should_receive(:api) { raise ::Heroku::API::Errors::NotFound.new("the message", nil) }.at_least(:once)
+        expect(provider).to receive(:api) { raise ::Heroku::API::Errors::NotFound.new("the message", nil) }.at_least(:once)
         expect { provider.deploy }.to raise_error(DPL::Error, 'the message (wrong app "example"?)')
       end
 
       example "unauthorized error" do
-        provider.should_receive(:api) { raise ::Heroku::API::Errors::Unauthorized.new("the message", nil) }.at_least(:once)
+        expect(provider).to receive(:api) { raise ::Heroku::API::Errors::Unauthorized.new("the message", nil) }.at_least(:once)
         expect { provider.deploy }.to raise_error(DPL::Error, 'the message (wrong API key?)')
       end
     end

data/spec/provider/modulus_spec.rb

@@ -6,23 +6,23 @@ describe DPL::Provider::Modulus do
     described_class.new(DummyContext.new, :api_key => 'test-token', :project_name => 'test-project')
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     it 'should require an api key' do
       provider.options.update(:api_key => nil)
       expect{ provider.check_auth }.to raise_error("must supply an api key")
     end
   end
 
-  describe :check_app do
+  describe "#check_app" do
     it 'should require a project name' do
       provider.options.update(:project_name => nil)
       expect{ provider.check_app }.to raise_error("must supply a project name")
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     it 'should include the api key and project name specified' do
-      provider.context.should_receive(:shell).with("MODULUS_TOKEN=test-token modulus deploy -p test-project")
+      expect(provider.context).to receive(:shell).with("MODULUS_TOKEN=test-token modulus deploy -p test-project")
       provider.push_app
     end
   end

data/spec/provider/ninefold_spec.rb

@@ -6,27 +6,27 @@ describe DPL::Provider::Ninefold do
     described_class.new(DummyContext.new, :auth_token => "123456789", :app_id => "1234")
   end
 
-  describe :check_auth do
+  describe "#check_auth" do
     it 'requires an auth token' do
       provider.options.update(:auth_token => nil)
       expect{ provider.check_auth }.to raise_error "must supply an auth token"
     end
   end
 
-  describe :check_app do
+  describe "#check_app" do
     it 'requires an app ID' do
       provider.options.update(:app_id => nil)
       expect{ provider.check_app }.to raise_error "must supply an app ID"
     end
   end
 
-  describe :needs_key? do
+  describe "#needs_key?" do
     it 'returns false' do
-      expect(provider.needs_key?).to be_false
+      expect(provider.needs_key?).to be_falsey
     end
   end
 
-  describe :push_app do
+  describe "#push_app" do
     it 'includes the auth token and app ID specified' do
       expect(provider.context).to receive(:shell).with("AUTH_TOKEN=123456789 APP_ID=1234 ninefold app redeploy --sure")
       provider.push_app