travis 1.11.0 → 1.12.0

data/spec/cli/help_spec.rb

@@ -1,33 +1,35 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Help do
-  example "travis help" do
+  example 'travis help' do
     run_cli('help').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis --help" do
+  example 'travis --help' do
     run_cli('--help').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis -h" do
+  example 'travis -h' do
     run_cli('-h').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis -?" do
+  example 'travis -?' do
     run_cli('-?').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis help endpoint" do
+  example 'travis help endpoint' do
     run_cli('help', 'endpoint').should be_success
-    stdout.should include("Usage: travis endpoint [OPTIONS]")
+    stdout.should include('Usage: travis endpoint [OPTIONS]')
   end
 
-  example "travis endpoint --help" do
+  example 'travis endpoint --help' do
     run_cli('endpoint', '--help').should be_success
-    stdout.should include("Usage: travis endpoint [OPTIONS]")
+    stdout.should include('Usage: travis endpoint [OPTIONS]')
   end
 end

data/spec/cli/history_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::History do

data/spec/cli/init_spec.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Init do
   old_path = Dir.pwd
   tmp_path = File.expand_path('travis-spec-init', Dir.tmpdir)
 
-  before(:each) do
+  before do
     FileUtils.mkdir_p(tmp_path)
     Dir.chdir(tmp_path)
     FileUtils.rm('.travis.yml') if File.exist?('.travis.yml')
   end
 
-  after(:each) do
+  after do
     Dir.chdir(old_path)
   end
 
-  example "travis init fakelanguage" do
+  example 'travis init fakelanguage' do
     run_cli('init', 'fakelanguage', '--skip-enable', '-r', 'travis-ci/travis.rb').should_not be_success
     stderr.should be == "unknown language fakelanguage\n"
   end
@@ -29,28 +31,28 @@ describe Travis::CLI::Init do
     end
 
     example "travis init #{language} (.travis.yml already exists, using --force)" do
-      File.open(".travis.yml", "w") { |f| f << "old file" }
+      File.open('.travis.yml', 'w') { |f| f << 'old file' }
       run_cli('init', language, '--force', '--skip-enable', '-r', 'travis-ci/travis.rb').should be_success
       stdout.should be == ".travis.yml file created!\n"
-      File.read(".travis.yml").should_not be == "old file"
+      File.read('.travis.yml').should_not be == 'old file'
     end
 
     example "travis init #{language} (.travis.yml already exists, not using --force)" do
-      File.open(".travis.yml", "w") { |f| f << "old file" }
+      File.open('.travis.yml', 'w') { |f| f << 'old file' }
       run_cli('init', language, '--skip-enable', '-r', 'travis-ci/travis.rb').should_not be_success
       stderr.should be == ".travis.yml already exists, use --force to override\n"
-      File.read('.travis.yml').should be == "old file"
+      File.read('.travis.yml').should be == 'old file'
     end
   end
 
   describe 'travis init c' do
-    it_should_behave_like 'travis init', 'c'
-
     let :result do
       run_cli('init', 'c', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'c'
+
     it 'sets compiler' do
       result.should include('compiler')
       result['compiler'].should include('clang')
@@ -59,17 +61,17 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init clojure' do
-    it_should_behave_like 'travis init', 'clojure'
+    it_behaves_like 'travis init', 'clojure'
   end
 
   describe 'travis init cpp' do
-    it_should_behave_like 'travis init', 'cpp'
-
     let :result do
       run_cli('init', 'cpp', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'cpp'
+
     it 'sets compiler' do
       result.should include('compiler')
       result['compiler'].should include('clang')
@@ -78,13 +80,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init erlang' do
-    it_should_behave_like 'travis init', 'erlang'
-
     let :result do
       run_cli('init', 'erlang', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'erlang'
+
     it 'sets compiler' do
       result.should include('otp_release')
       result['otp_release'].should include('R16B')
@@ -92,13 +94,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init go' do
-    it_should_behave_like 'travis init', 'go'
-
     let :result do
       run_cli('init', 'go', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'go'
+
     it 'sets compiler' do
       result.should include('go')
       result['go'].should include('1.0')
@@ -107,21 +109,21 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init groovy' do
-    it_should_behave_like 'travis init', 'groovy'
+    it_behaves_like 'travis init', 'groovy'
   end
 
   describe 'travis init haskell' do
-    it_should_behave_like 'travis init', 'haskell'
+    it_behaves_like 'travis init', 'haskell'
   end
 
   describe 'travis init java' do
-    it_should_behave_like 'travis init', 'java'
-
     let :result do
       run_cli('init', 'java', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'java'
+
     it 'sets compiler' do
       result.should include('jdk')
       result['jdk'].should include('oraclejdk7')
@@ -130,13 +132,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init node_js' do
-    it_should_behave_like 'travis init', 'node_js'
-
     let :result do
       run_cli('init', 'node_js', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'node_js'
+
     it 'sets compiler' do
       result.should include('node_js')
       result['node_js'].should include('stable')
@@ -146,17 +148,17 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init objective-c' do
-    it_should_behave_like 'travis init', 'objective-c'
+    it_behaves_like 'travis init', 'objective-c'
   end
 
   describe 'travis init perl' do
-    it_should_behave_like 'travis init', 'perl'
-
     let :result do
       run_cli('init', 'perl', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'perl'
+
     it 'sets compiler' do
       result.should include('perl')
       result['perl'].should include('5.16')
@@ -165,13 +167,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init php' do
-    it_should_behave_like 'travis init', 'php'
-
     let :result do
       run_cli('init', 'php', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'php'
+
     it 'sets compiler' do
       result.should include('php')
       result['php'].should include('5.5')
@@ -180,13 +182,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init python' do
-    it_should_behave_like 'travis init', 'python'
-
     let :result do
       run_cli('init', 'python', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'python'
+
     it 'sets compiler' do
       result.should include('python')
       result['python'].should include('2.7')
@@ -195,13 +197,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init ruby' do
-    it_should_behave_like 'travis init', 'ruby'
-
     let :result do
       run_cli('init', 'ruby', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'ruby'
+
     it 'sets compiler' do
       result.should include('rvm')
       result['rvm'].should     include('1.9.3')
@@ -211,13 +213,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init scala' do
-    it_should_behave_like 'travis init', 'scala'
-
     let :result do
       run_cli('init', 'scala', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'scala'
+
     it 'sets compiler' do
       result.should include('scala')
       result['scala'].should include('2.10.1')

data/spec/cli/logs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Logs do

data/spec/cli/open_spec.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Open do
   example 'travis open -p' do
     run_cli('open', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb})
   end
 
   example 'travis open 6180 -p' do
     run_cli('open', '6180', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb\/builds\/4125095/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb/builds/4125095})
   end
 
   example 'travis open 6180.1 -p' do
     run_cli('open', '6180.1', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb\/jobs\/4125096/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb/jobs/4125096})
   end
 
   example 'travis open -pg' do
     run_cli('open', '-pg').should be_success
-    stdout.should match(/https:\/\/github.com\/[\w\W]*\/travis\.rb/)
+    stdout.should match(%r{https://github.com/[\w\W]*/travis\.rb})
   end
 
   example 'travis open 6180 -pg' do

data/spec/cli/repo_command_spec.rb

@@ -1,25 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'uri'
 
 describe Travis::CLI::RepoCommand do
   describe '#parse_remote' do
+    subject(:repo_command) { described_class.new }
+
     it 'handles git@github.com URIs' do
-      path = subject.send(:parse_remote, 'git@github.com:travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'git@github.com:travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'handles GitHub Enterprise URIS' do
-      path = subject.send(:parse_remote, 'git@example.com:travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'git@example.com:travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'handles HTTPS URIs' do
-      path = subject.send(:parse_remote, 'https://github.com/travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'https://github.com/travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'raises URI::InvalidURIError for invalid URIs' do
-      expect { subject.send(:parse_remote, "foo@example.com:baz/bar.git") }.to raise_error(URI::InvalidURIError)
+      expect { repo_command.send(:parse_remote, 'foo@example.com:baz/bar.git') }.to raise_error(URI::InvalidURIError)
     end
   end
 end

data/spec/cli/restart_spec.rb

@@ -1,15 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Restart do
   example 'travis restart' do
     run_cli('restart', '-t', 'token').should be_success
-    $params['id'].should be == "4125095"
-    $params['entity'].should be == "builds"
   end
 
   example 'travis restart 6180.1' do
     run_cli('restart', '6180.1', '-t', 'token').should be_success
-    $params['entity'].should be == "jobs"
-    $params['id'].should be == "4125096"
   end
 end

data/spec/cli/setup/service_spec.rb

@@ -1,53 +1,52 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Setup::Service do
   subject :service do
-    repository = double('repository',{:slug => 'test_slug'})
-    setup = double('Setup', :repository => repository)
+    repository = double('repository', { slug: 'test_slug' })
+    setup = double('Setup', repository:)
     described_class.new(setup)
   end
-  
+
   describe '#deploy' do
-  
     subject :deploy_config do
-      {'provider' => 'dummy'}
+      { 'provider' => 'dummy' }
     end
-    
+
     before do
       allow(service).to receive(:configure).and_yield(deploy_config)
       allow(service).to receive(:on).and_return(nil)
     end
-  
+
     context 'with no existing deploy section' do
-    
       it 'creates section contents without optional items' do
         service.send(:deploy, 'dummy') { |_| }
         expect(deploy_config).to include(
-            'provider'      => 'dummy',
-            'skip_cleanup'   => 'true'
+          'provider' => 'dummy',
+          'skip_cleanup' => 'true'
         )
       end
     end
-    
+
     context 'with existing deploy section' do
       it 'doesn\'t overwrite existing skip_cleanup' do
-        deploy_config['skip_cleanup']='false'
+        deploy_config['skip_cleanup'] = 'false'
         service.send(:deploy, 'dummy') { |_| }
-        expect(deploy_config).to include('skip_cleanup'   => 'false')
+        expect(deploy_config).to include('skip_cleanup' => 'false')
       end
 
       it 'doesn\'t set skip_cleanup for v2' do
-        deploy_config['edge']='true'
+        deploy_config['edge'] = 'true'
         service.send(:deploy, 'dummy') { |_| }
         expect(deploy_config).not_to include('skip_cleanup')
       end
-      
+
       it 'sets skip_cleanup for explicit v1' do
-        deploy_config['edge']='false'
+        deploy_config['edge'] = 'false'
         service.send(:deploy, 'dummy') { |_| }
-        expect(deploy_config).to include('skip_cleanup'   => 'true')
+        expect(deploy_config).to include('skip_cleanup' => 'true')
       end
     end
-    
   end
 end

data/spec/cli/setup_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe Travis::CLI::Setup do
-  # TODO
-end
+require 'spec_helper'

data/spec/cli/show_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Show do
   example 'show 6180.1' do
     run_cli('show', '6180.1', '-E').should be_success
-    stdout.should include("Config:        ")
-    stdout.should include("env: GEM=railties")
+    stdout.should include('Config:        ')
+    stdout.should include('env: GEM=railties')
   end
 end

data/spec/cli/status_spec.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Status do
-  example "travis status" do
+  example 'travis status' do
     run_cli('status').should be_success
     stdout.should be == "failed\n"
   end
 
-  example "travis status -x" do
+  example 'travis status -x' do
     run_cli('status', '-x').should_not be_success
     stdout.should be == "failed\n"
   end
 
-  example "travis status -q" do
+  example 'travis status -q' do
     run_cli('status', '-q').should be_success
     stdout.should be_empty
   end
 
-  example "travis status -pqx" do
+  example 'travis status -pqx' do
     run_cli('endpoint', '-pqx').should_not be_success
     stdout.should be_empty
   end
 
-  example "travis status -i" do
+  example 'travis status -i' do
     run_cli('status', '-i', '--skip-completion-check', '-r', 'travis-ci/travis.rb').should be_success
     stdout.should be == "build #6180 failed\n"
   end

data/spec/cli/token_spec.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Token do
-  example "travis token (access token set)" do
+  example 'travis token (access token set)' do
     run_cli('token', '-t', 'super-secret').should be_success
-    stdout.should == "super-secret\n"
+    stdout.should
     stderr.should be_empty
   end
 
-  example "travis token -i (access token set)" do
+  example 'travis token -i (access token set)' do
     run_cli('token', '-it', 'super-secret').should be_success
-    stdout.should == "Your access token is super-secret\n"
+    stdout.should
     stderr.should be_empty
   end
 
@@ -17,6 +19,6 @@ describe Travis::CLI::Token do
     run_cli('token').should_not be_success
 
     stdout.should be_empty
-    stderr.should == "not logged in, please run #{File.basename($0)} login\n"
+    stderr.should == "not logged in, please run #{File.basename($PROGRAM_NAME)} login\n"
   end
 end

data/spec/cli/version_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Version do

data/spec/cli/whoami_spec.rb

@@ -1,32 +1,34 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Whoami do
-  example "travis whoami" do
+  example 'travis whoami' do
     run_cli('whoami').should_not be_success
     stdout.should be_empty
-    stderr.should be == "not logged in, please run #{File.basename $0} login\n"
+    stderr.should be == "not logged in, please run #{File.basename $PROGRAM_NAME} login\n"
   end
 
-  example "travis whoami --pro" do
+  example 'travis whoami --pro' do
     run_cli('whoami', '--pro').should_not be_success
     stdout.should be_empty
-    stderr.should be == "not logged in, please run #{File.basename $0} login --pro\n"
+    stderr.should be == "not logged in, please run #{File.basename $PROGRAM_NAME} login\n"
   end
 
-  example "travis whoami -t token" do
+  example 'travis whoami -t token' do
     run_cli('whoami', '-t', 'token').should be_success
     stdout.should be == "rkh\n"
     stderr.should be_empty
   end
 
-  example "TRAVIS_TOKEN=token travis whoami" do
+  example 'TRAVIS_TOKEN=token travis whoami' do
     ENV['TRAVIS_TOKEN'] = 'token'
     run_cli('whoami').should be_success
     stdout.should be == "rkh\n"
     stderr.should be_empty
   end
 
-  example "travis whoami -t token -i" do
+  example 'travis whoami -t token -i' do
     run_cli('whoami', '-t', 'token', '-i').should be_success
     stdout.should be == "You are rkh (Konstantin Haase)\n"
     stderr.should be_empty

data/spec/client/account_spec.rb

@@ -1,32 +1,40 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Account do
-  context "from all accounts" do
-    let(:session) { Travis::Client.new }
+  context 'with all accounts' do
     subject { session.accounts.first }
-    its(:name) { should be == 'Konstantin Haase' }
-    its(:login) { should be == 'rkh' }
-    its(:type) { should be == 'user' }
-    its(:repos_count) { should be == 200 }
-    its(:inspect) { should be == "#<Travis::Client::Account: rkh>" }
-  end
 
-  context "known account" do
     let(:session) { Travis::Client.new }
-    subject { session.account('rkh') }
-    its(:name) { should be == 'Konstantin Haase' }
-    its(:login) { should be == 'rkh' }
-    its(:type) { should be == 'user' }
-    its(:repos_count) { should be == 200 }
-    its(:inspect) { should be == "#<Travis::Client::Account: rkh>" }
+
+    its(:name) { is_expected.to be == 'Konstantin Haase' }
+    its(:login) { is_expected.to be == 'rkh' }
+    its(:type) { is_expected.to be == 'user' }
+    its(:repos_count) { is_expected.to be == 200 }
+    its(:inspect) { is_expected.to be == '#<Travis::Client::Account: rkh>' }
   end
 
-  context "known account" do
+  context 'with known account' do
+    subject { session.account('rkh') }
+
     let(:session) { Travis::Client.new }
+
+    its(:name) { is_expected.to be == 'Konstantin Haase' }
+    its(:login) { is_expected.to be == 'rkh' }
+    its(:type) { is_expected.to be == 'user' }
+    its(:repos_count) { is_expected.to be == 200 }
+    its(:inspect) { is_expected.to be == '#<Travis::Client::Account: rkh>' }
+  end
+
+  context 'with known account and nil name' do
     subject { session.account('foo') }
-    its(:name) { should be_nil }
-    its(:login) { should be == 'foo' }
-    its(:type) { should be_nil }
-    its(:inspect) { should be == "#<Travis::Client::Account: foo>" }
+
+    let(:session) { Travis::Client.new }
+
+    its(:name) { is_expected.to be_nil }
+    its(:login) { is_expected.to be == 'foo' }
+    its(:type) { is_expected.to be_nil }
+    its(:inspect) { is_expected.to be == '#<Travis::Client::Account: foo>' }
   end
 end