travis 1.11.0 → 1.12.0

data/spec/client/auto_login_spec.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'travis/client/auto_login'
 require 'spec_helper'
 
 describe Travis::Client::AutoLogin do
-  let(:auto_login_with_token) { Travis::Client::AutoLogin.new(Travis::Client.new, { config_file: travis_config }) }
-  let(:auto_login_without_token) { Travis::Client::AutoLogin.new(Travis::Client.new) }
-  let(:travis_config) { File.expand_path("../support/fake_travis_config.yml", File.dirname(__FILE__)) }
+  let(:auto_login_with_token) { described_class.new(Travis::Client.new, { config_file: travis_config }) }
+  let(:auto_login_without_token) { described_class.new(Travis::Client.new) }
+  let(:travis_config) { File.expand_path('../support/fake_travis_config.yml', File.dirname(__FILE__)) }
 
-  context "authenticate" do
-    context "when user has a token in cli config" do
-      it "does not call Tools::Github#with_token" do
-        expect_any_instance_of(Travis::Tools::Github).to_not receive(:with_token)
+  context 'when user authenticates' do
+    context 'when user has a token in cli config' do
+      it 'does not call Tools::Github#with_token' do
+        expect_any_instance_of(Travis::Tools::Github).not_to receive(:with_token)
         auto_login_with_token.authenticate
       end
     end
 
-    context "when user does not have a token in cli config" do
+    context 'when user does not have a token in cli config' do
       before { auto_login_without_token.github.stub(:with_token).and_return(true) }
-      it "calls Tools::Github#with_token" do
+
+      it 'calls Tools::Github#with_token' do
         expect(auto_login_without_token.github).to receive(:with_token)
         auto_login_without_token.authenticate
       end

data/spec/client/broadcast_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Broadcast do
-  let(:session) { Travis::Client.new }
   subject { session.broadcasts.first }
 
-  its(:id) { should be == 1 }
-  its(:message) { should be == "Hello!" }
+  let(:session) { Travis::Client.new }
 
+  its(:id) { is_expected.to be == 1 }
+  its(:message) { is_expected.to be == 'Hello!' }
 end

data/spec/client/build_spec.rb

@@ -1,31 +1,35 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Build do
+  subject { session.build(4_125_095) }
+
   let(:session) { Travis::Client.new }
-  subject { session.build(4125095) }
-  its(:number) { should be == '6180' }
-  its(:state) { should be == 'failed' }
-  its(:duration) { should be == 5019 }
-  its(:started_at) { should be_a(Time) }
-  its(:finished_at) { should be_nil }
-  its(:inspect) { should be == "#<Travis::Client::Build: rails/rails#6180>" }
-  its(:color) { should be == 'red' }
-  its(:commit) { should be_a(Travis::Client::Commit) }
-  its(:jobs) { should be_an(Array) }
-  its(:repository) { should be == session.repo('rails/rails') }
 
-  it { should be == subject.repository.last_build }
+  its(:number) { is_expected.to be == '6180' }
+  its(:state) { is_expected.to be == 'failed' }
+  its(:duration) { is_expected.to be == 5019 }
+  its(:started_at) { is_expected.to be_a(Time) }
+  its(:finished_at) { is_expected.to be_nil }
+  its(:inspect) { is_expected.to be == '#<Travis::Client::Build: rails/rails#6180>' }
+  its(:color) { is_expected.to be == 'red' }
+  its(:commit) { is_expected.to be_a(Travis::Client::Commit) }
+  its(:jobs) { is_expected.to be_an(Array) }
+  its(:repository) { is_expected.to be == session.repo('rails/rails') }
+
+  it { is_expected.to be == subject.repository.last_build }
 
-  it { should_not be_pending  }
-  it { should     be_started  }
-  it { should     be_finished }
-  it { should_not be_passed   }
-  it { should_not be_errored  }
-  it { should     be_failed   }
-  it { should_not be_canceled }
-  it { should     be_created  }
-  it { should     be_red      }
-  it { should_not be_green    }
-  it { should_not be_yellow   }
-  it { should be_unsuccessful }
+  it { is_expected.not_to be_pending  }
+  it { is_expected.to     be_started  }
+  it { is_expected.to     be_finished }
+  it { is_expected.not_to be_passed   }
+  it { is_expected.not_to be_errored  }
+  it { is_expected.to     be_failed   }
+  it { is_expected.not_to be_canceled }
+  it { is_expected.to     be_created  }
+  it { is_expected.to     be_red      }
+  it { is_expected.not_to be_green    }
+  it { is_expected.not_to be_yellow   }
+  it { is_expected.to be_unsuccessful }
 end

data/spec/client/commit_spec.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Build do
+  subject { session.build(4_125_095).commit }
+
   let(:session) { Travis::Client.new }
-  subject { session.build(4125095).commit }
 
-  its(:sha) { should be == 'a0265b98f16c6e33be32aa3f57231d1189302400' }
-  its(:short_sha) { should be == 'a0265b9' }
-  its(:branch) { should be == 'master' }
-  its(:message) { should be == 'Associaton -> Association' }
-  its(:committed_at) { should be_a(Time) }
-  its(:author_name) { should be == 'Steve Klabnik' }
-  its(:author_email) { should be == 'steve@steveklabnik.com' }
-  its(:committer_name) { should be == 'Steve Klabnik' }
-  its(:committer_email) { should be == 'steve@steveklabnik.com' }
-  its(:compare_url) { should be == 'https://github.com/rails/rails/compare/6581d798e830...a0265b98f16c' }
-  its(:subject) { should be == 'Associaton -> Association' }
+  its(:sha) { is_expected.to be == 'a0265b98f16c6e33be32aa3f57231d1189302400' }
+  its(:short_sha) { is_expected.to be == 'a0265b9' }
+  its(:branch) { is_expected.to be == 'master' }
+  its(:message) { is_expected.to be == 'Associaton -> Association' }
+  its(:committed_at) { is_expected.to be_a(Time) }
+  its(:author_name) { is_expected.to be == 'Steve Klabnik' }
+  its(:author_email) { is_expected.to be == 'steve@steveklabnik.com' }
+  its(:committer_name) { is_expected.to be == 'Steve Klabnik' }
+  its(:committer_email) { is_expected.to be == 'steve@steveklabnik.com' }
+  its(:compare_url) { is_expected.to be == 'https://github.com/rails/rails/compare/6581d798e830...a0265b98f16c' }
+  its(:subject) { is_expected.to be == 'Associaton -> Association' }
 
-  specify "with missing data" do
-    session.load("commit" => { "id" => 12 })['commit'].subject.should be_empty
+  specify 'with missing data' do
+    session.load('commit' => { 'id' => 12 })['commit'].subject.should be_empty
   end
 end

data/spec/client/job_spec.rb

@@ -1,30 +1,34 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Job do
+  subject { session.job(4_125_097) }
+
   let(:session) { Travis::Client.new }
-  subject { session.job(4125097) }
-  its(:number) { should be == '6180.2' }
-  its(:state) { should be == 'passed' }
-  its(:started_at) { should be_a(Time) }
-  its(:finished_at) { should be_a(Time) }
-  its(:inspect) { should be == "#<Travis::Client::Job: rails/rails#6180.2>" }
-  its(:color) { should be == 'green' }
-  its(:commit) { should be_a(Travis::Client::Commit) }
-  its(:repository) { should be == session.repo('rails/rails') }
-  its(:duration) { should be == 905 }
 
-  it { should be == subject.build.jobs[1] }
+  its(:number) { is_expected.to be == '6180.2' }
+  its(:state) { is_expected.to be == 'passed' }
+  its(:started_at) { is_expected.to be_a(Time) }
+  its(:finished_at) { is_expected.to be_a(Time) }
+  its(:inspect) { is_expected.to be == '#<Travis::Client::Job: rails/rails#6180.2>' }
+  its(:color) { is_expected.to be == 'green' }
+  its(:commit) { is_expected.to be_a(Travis::Client::Commit) }
+  its(:repository) { is_expected.to be == session.repo('rails/rails') }
+  its(:duration) { is_expected.to be == 905 }
+
+  it { is_expected.to be == subject.build.jobs[1] }
 
-  it { should_not be_pending      }
-  it { should     be_started      }
-  it { should     be_finished     }
-  it { should     be_passed       }
-  it { should_not be_errored      }
-  it { should_not be_failed       }
-  it { should_not be_canceled     }
-  it { should     be_created      }
-  it { should_not be_red          }
-  it { should     be_green        }
-  it { should_not be_yellow       }
-  it { should_not be_unsuccessful }
+  it { is_expected.not_to be_pending      }
+  it { is_expected.to     be_started      }
+  it { is_expected.to     be_finished     }
+  it { is_expected.to     be_passed       }
+  it { is_expected.not_to be_errored      }
+  it { is_expected.not_to be_failed       }
+  it { is_expected.not_to be_canceled     }
+  it { is_expected.to     be_created      }
+  it { is_expected.not_to be_red          }
+  it { is_expected.to     be_green        }
+  it { is_expected.not_to be_yellow       }
+  it { is_expected.not_to be_unsuccessful }
 end

data/spec/client/methods_spec.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Methods do
+  subject { OpenStruct.new(session:).extend(described_class) }
+
   let(:session) { Travis::Client.new }
-  subject { OpenStruct.new(:session => session).extend(Travis::Client::Methods) }
+
   before { subject.access_token = 'token' }
 
-  its(:api_endpoint) { should be == 'https://api.travis-ci.org/' }
-  its(:repos) { should be == session.find_many(Travis::Client::Repository) }
-  its(:user) { should be == session.find_one(Travis::Client::User) }
+  its(:api_endpoint) { is_expected.to be == 'https://api.travis-ci.com/' }
+  its(:repos) { is_expected.to be == session.find_many(Travis::Client::Repository) }
+  its(:user) { is_expected.to be == session.find_one(Travis::Client::User) }
 
   it 'fetches a single repo' do
     subject.repo(891).slug.should be == 'rails/rails'

data/spec/client/namespace_spec.rb

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Namespace do
-  it { should be_a(Travis::Client::Methods) }
+  subject(:namespace) { described_class.new }
+
+  it { is_expected.to be_a(Travis::Client::Methods) }
 
   it 'creates a dummy for repos' do
-    repo = subject::Repository
+    repo = namespace::Repository
     repo.find_one('rails/rails').should be_a(Travis::Client::Repository)
     repo.find_many.should be_an(Array)
     repo.current.should be == repo.find_many
   end
 
   it 'creates a dummy for user' do
-    subject.access_token = 'token'
-    user = subject::User
+    namespace.access_token = 'token'
+    user = namespace::User
     user.find_one.should be_a(Travis::Client::User)
     user.current.should be == user.find_one
   end

data/spec/client/repository_spec.rb

@@ -1,39 +1,42 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Repository do
+  subject(:repository) { session.repo('rails/rails') }
+
   let(:session) { Travis::Client.new }
-  subject { session.repo('rails/rails') }
 
-  its(:slug) { should be == 'rails/rails' }
-  its(:description) { should_not be_empty }
-  its(:last_build_id) { should be == 4125095 }
-  its(:last_build_number) { should be == '6180' }
-  its(:last_build_state) { should be == 'failed' }
-  its(:last_build_duration) { should be == 5019 }
-  its(:last_build_started_at) { should be_a(Time) }
-  its(:last_build_finished_at) { should be_nil }
-  its(:inspect) { should be == "#<Travis::Client::Repository: rails/rails>" }
-  its(:key) { should be_a(Travis::Client::Repository::Key) }
-  its(:last_build) { should be_a(Travis::Client::Build) }
-  its(:color) { should be == 'red' }
-  its(:github_language) { should be == 'Ruby' }
-  its(:owner_name) { should be == 'rails' }
-  its(:owner) { should be == session.account("rails") }
+  its(:slug) { is_expected.to be == 'rails/rails' }
+  its(:description) { is_expected.not_to be_empty }
+  its(:last_build_id) { is_expected.to be == 4_125_095 }
+  its(:last_build_number) { is_expected.to be == '6180' }
+  its(:last_build_state) { is_expected.to be == 'failed' }
+  its(:last_build_duration) { is_expected.to be == 5019 }
+  its(:last_build_started_at) { is_expected.to be_a(Time) }
+  its(:last_build_finished_at) { is_expected.to be_nil }
+  its(:inspect) { is_expected.to be == '#<Travis::Client::Repository: rails/rails>' }
+  its(:key) { is_expected.to be_a(Travis::Client::Repository::Key) }
+  its(:last_build) { is_expected.to be_a(Travis::Client::Build) }
+  its(:color) { is_expected.to be == 'red' }
+  its(:github_language) { is_expected.to be == 'Ruby' }
+  its(:owner_name) { is_expected.to be == 'rails' }
+  its(:owner) { is_expected.to be == session.account('rails') }
 
-  it { should_not be_pending  }
-  it { should     be_started  }
-  it { should     be_finished }
-  it { should_not be_passed   }
-  it { should_not be_errored  }
-  it { should     be_failed   }
-  it { should_not be_canceled }
-  it { should     be_created  }
-  it { should     be_red      }
-  it { should_not be_green    }
-  it { should_not be_yellow   }
-  it { should be_unsuccessful }
+  it { is_expected.not_to be_pending  }
+  it { is_expected.to     be_started  }
+  it { is_expected.to     be_finished }
+  it { is_expected.not_to be_passed   }
+  it { is_expected.not_to be_errored  }
+  it { is_expected.to     be_failed   }
+  it { is_expected.not_to be_canceled }
+  it { is_expected.to     be_created  }
+  it { is_expected.to     be_red      }
+  it { is_expected.not_to be_green    }
+  it { is_expected.not_to be_yellow   }
+  it { is_expected.to be_unsuccessful }
 
-  it 'should expose the pubkey fingerprint' do
-    subject.public_key.fingerprint.should be == 'foobar'
+  it 'exposes the pubkey fingerprint' do
+    repository.public_key.fingerprint.should be == 'foobar'
   end
 end

data/spec/client/session_spec.rb

@@ -1,165 +1,169 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Session do
-  it { should be_a(Travis::Client::Methods) }
+  subject(:session) { described_class.new }
+
+  it { is_expected.to be_a(Travis::Client::Methods) }
 
-  describe "uri" do
-    its(:uri) { should be == "https://api.travis-ci.org/" }
+  describe 'uri' do
+    its(:uri) { is_expected.to be == 'https://api.travis-ci.com/' }
 
     it 'can be set as argument' do
-      Travis::Client::Session.new('http://foo/').uri.should be == 'http://foo/'
+      described_class.new('http://foo/').uri.should be == 'http://foo/'
     end
 
     it 'can be set as hash argument' do
-      Travis::Client::Session.new(:uri => 'http://foo/').uri.should be == 'http://foo/'
+      described_class.new(uri: 'http://foo/').uri.should be == 'http://foo/'
     end
   end
 
-  describe "access_token" do
-    its(:access_token) { should be_nil }
+  describe 'access_token' do
+    its(:access_token) { is_expected.to be_nil }
 
     it 'gives authenticated access if set' do
-      subject.access_token = 'token'
-      subject.user.login.should be == 'rkh'
+      session.access_token = 'token'
+      session.user.login.should be == 'rkh'
     end
 
     it 'raises if token is not set' do
-      expect { subject.user.login }.to raise_error(Travis::Client::Error)
+      expect { session.user.login }.to raise_error(Travis::Client::Error)
     end
   end
 
-  describe "connection" do
-    its(:connection) { should be_a(Faraday::Connection) }
+  describe 'connection' do
+    its(:connection) { is_expected.to be_a(Faraday::Connection) }
 
     it 'creates a new connection when changing the uri' do
-      old_connection = subject.connection
-      subject.uri    = 'http://localhost:3000'
-      subject.connection.should_not be == old_connection
+      old_connection = session.connection
+      session.uri    = 'http://localhost:3000'
+      session.connection.should_not be == old_connection
     end
   end
 
-  describe "headers" do
+  describe 'headers' do
     it 'propagates headers to connection headers' do
-      subject.headers['foo'] = 'bar'
-      subject.connection.headers.should include('foo')
+      session.headers['foo'] = 'bar'
+      session.connection.headers.should include('foo')
     end
 
     it 'propagates headers to new connections' do
-      subject.headers['foo'] = 'bar'
-      subject.connection = Faraday::Connection.new
-      subject.connection.headers.should include('foo')
+      session.headers['foo'] = 'bar'
+      session.connection = Faraday::Connection.new
+      session.connection.headers.should include('foo')
     end
 
     it 'is possible to set headers as constructor option' do
-      Travis::Client::Session.new(:headers => {'foo' => 'bar'}, :uri => 'http://localhost:3000/').
-        connection.headers['foo'].should be == 'bar'
+      described_class.new(headers: { 'foo' => 'bar' }, uri: 'http://localhost:3000/')
+                     .connection.headers['foo'].should be == 'bar'
     end
 
     it 'sets a User-Agent' do
-      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
-      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
-      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
-      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+      session.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      session.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      session.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      session.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
     end
 
     it 'allows adding custom info to the User-Agent' do
-      subject.agent_info = "foo"
-      subject.headers['User-Agent'].should include("foo")
-      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
-      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
-      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
-      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+      session.agent_info = 'foo'
+      session.headers['User-Agent'].should include('foo')
+      session.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      session.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      session.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      session.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
     end
   end
 
-  describe "find_one" do
+  describe 'find_one' do
     it 'finds one instance' do
-      repo = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      repo = session.find_one(Travis::Client::Repository, 'rails/rails')
       repo.should be_a(Travis::Client::Repository)
       repo.slug.should be == 'rails/rails'
     end
   end
 
-  describe "find_many" do
+  describe 'find_many' do
     it 'finds many instances' do
-      repos = subject.find_many(Travis::Client::Repository)
+      repos = session.find_many(Travis::Client::Repository)
       repos.should be_an(Array)
       repos.each { |repo| repo.should be_a(Travis::Client::Repository) }
-      repos.first.slug.should be == "pypug/django-mango"
+      repos.first.slug.should be == 'pypug/django-mango'
     end
   end
 
-  describe "find_one_or_many" do
+  describe 'find_one_or_many' do
     it 'finds one instance' do
-      subject.access_token = 'token'
-      subject.find_one_or_many(Travis::Client::User).should be_a(Travis::Client::User)
+      session.access_token = 'token'
+      session.find_one_or_many(Travis::Client::User).should be_a(Travis::Client::User)
     end
 
     it 'finds many instances' do
-      subject.find_one_or_many(Travis::Client::Repository).should be_an(Array)
+      session.find_one_or_many(Travis::Client::Repository).should be_an(Array)
     end
   end
 
-  describe "reload" do
+  describe 'reload' do
     it 'reloads an instance' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.reload(rails)
+      session.reload(rails)
       rails.description.should be == 'Rails on the Rubies'
     end
   end
 
-  describe "get" do
+  describe 'get' do
     it 'fetches a payload and substitutes values with entities' do
-      result = subject.get('/repos/')
-      result['repos'].first.slug.should be == "pypug/django-mango"
+      result = session.get('/repos/')
+      result['repos'].first.slug.should be == 'pypug/django-mango'
     end
   end
 
-  describe "clear_cache" do
+  describe 'clear_cache' do
     it 'resets all the entities' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.clear_cache
+      session.clear_cache
       rails.description.should be == 'Rails on the Rubies'
     end
 
     it 'keeps entries in the identity map' do
-      rails = subject.repo('rails/rails')
-      subject.clear_cache
-      subject.repo('rails/rails').should be_equal(rails)
+      rails = session.repo('rails/rails')
+      session.clear_cache
+      session.repo('rails/rails').should be_equal(rails)
     end
   end
 
-  describe "clear_cache!" do
+  describe 'clear_cache!' do
     it 'resets all the entities' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.clear_cache!
+      session.clear_cache!
       rails.description.should be == 'Rails on the Rubies'
     end
 
     it 'does not keep entries in the identity map' do
-      rails = subject.repo('rails/rails')
-      subject.clear_cache!
-      subject.repo('rails/rails').should_not be_equal(rails)
+      rails = session.repo('rails/rails')
+      session.clear_cache!
+      session.repo('rails/rails').should_not be_equal(rails)
     end
   end
 
-  describe "session" do
-    its(:session) { should eq(subject) }
+  describe 'session' do
+    its(:session) { is_expected.to eq(session) }
   end
 
-  describe "config" do
-    its(:config) { should be == {"host" => "travis-ci.org"}}
+  describe 'config' do
+    its(:config) { is_expected.to be == { 'host' => 'travis-ci.org' } }
   end
 end

data/spec/client/user_spec.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::User do
   # attributes :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
-  subject { Travis::Client.new(:access_token => 'token').user }
-  its(:login) { should be == 'rkh' }
-  its(:name) { should be == 'Konstantin Haase' }
-  its(:email) { should be == 'konstantin.haase@gmail.com' }
-  its(:gravatar_id) { should be == '5c2b452f6eea4a6d84c105ebd971d2a4' }
-  its(:locale) { should be == 'en' }
-  its(:is_syncing) { should be false }
-  its(:synced_at) { should be_a(Time) }
+  subject { Travis::Client.new(access_token: 'token').user }
+
+  its(:login) { is_expected.to be == 'rkh' }
+  its(:name) { is_expected.to be == 'Konstantin Haase' }
+  its(:email) { is_expected.to be == 'konstantin.haase@gmail.com' }
+  its(:gravatar_id) { is_expected.to be == '5c2b452f6eea4a6d84c105ebd971d2a4' }
+  its(:locale) { is_expected.to be == 'en' }
+  its(:is_syncing) { is_expected.to be false }
+  its(:synced_at) { is_expected.to be_a(Time) }
 
-  it { should_not be_syncing }
-  it { should be_correct_scopes }
+  it { is_expected.not_to be_syncing }
+  it { is_expected.to be_correct_scopes }
 end

data/spec/client_spec.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client do
-  its(:new) { should be_a(Travis::Client::Session) }
+  its(:new) { is_expected.to be_a(Travis::Client::Session) }
 
   it 'accepts string argument' do
-    Travis::Client.new('http://foo/').uri.should be == 'http://foo/'
+    described_class.new('http://foo/').uri.should be == 'http://foo/'
   end
 
   it 'accepts options hash with string keys' do
-    Travis::Client.new('uri' => 'http://foo/').uri.should be == 'http://foo/'
+    described_class.new('uri' => 'http://foo/').uri.should be == 'http://foo/'
   end
 
   it 'accepts options hash with symbol keys' do
-    Travis::Client.new(:uri => 'http://foo/').uri.should be == 'http://foo/'
+    described_class.new(uri: 'http://foo/').uri.should be == 'http://foo/'
   end
 end

data/spec/pro_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Pro do
-  it { should be_a(Travis::Client::Namespace) }
-  its(:api_endpoint) { should be == 'https://api.travis-ci.com/' }
+  it { is_expected.to be_a(Travis::Client::Namespace) }
+  its(:api_endpoint) { is_expected.to be == 'https://api.travis-ci.com/' }
 
   it 'has a nice inspect on entities' do
-    Travis::Pro::Repository.find('rails/rails').inspect.should be == "#<Travis::Pro::Repository: rails/rails>"
+    Travis::Pro::Repository.find('rails/rails').inspect.should be == '#<Travis::Pro::Repository: rails/rails>'
   end
 end