From acef07e036bc3f425d6552a5729638371df30f68 Mon Sep 17 00:00:00 2001 From: yoshihara Date: Thu, 2 Apr 2015 16:09:07 +0900 Subject: [PATCH 1/3] Remove its syntax depended on 'rspec-its' gem --- spec/models/fluentd/agent/common_spec.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spec/models/fluentd/agent/common_spec.rb b/spec/models/fluentd/agent/common_spec.rb index 15eea8c..dab50bf 100644 --- a/spec/models/fluentd/agent/common_spec.rb +++ b/spec/models/fluentd/agent/common_spec.rb @@ -13,21 +13,27 @@ describe 'Fluentd::Agent::Common' do describe '#pid' do context 'no pid file exists' do - its(:pid) { should be_nil } + it "should be nil" do + expect(subject.pid).to be_nil + end end context 'empty pid file given' do before { FileUtils.touch pid_file_path } after { FileUtils.rm pid_file_path } - its(:pid) { should be_nil } + it "should be nil" do + expect(subject.pid).to be_nil + end end context 'valid pid file given' do before { File.write pid_file_path, '9999' } after { FileUtils.rm pid_file_path } - its(:pid) { should eq(9999) } + it "should be 9999" do + expect(subject.pid).to eq(9999) + end end end From daa7685b08431e06e589fadc44f7205422dad7bb Mon Sep 17 00:00:00 2001 From: yoshihara Date: Thu, 2 Apr 2015 16:15:02 +0900 Subject: [PATCH 2/3] Remove rspec-its requiring --- spec/spec_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e4c349f..78593a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,7 +12,6 @@ end ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' -require 'rspec/its' require 'webmock/rspec' WebMock.disable_net_connect!(allow_localhost: true) require 'capybara/poltergeist' From c6e5ef5bc3e4dab355fadc053f1481353eef82ab Mon Sep 17 00:00:00 2001 From: yoshihara Date: Thu, 2 Apr 2015 16:16:00 +0900 Subject: [PATCH 3/3] Remove rspec-its gem from dependency gems --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index 38e459b..52ff35d 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ group :development do end group :test do - gem "rspec-its" gem "factory_girl_rails" gem "database_cleaner", "~> 1.2.0" gem "capybara", "~> 2.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 73fd1f6..e9aa347 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,9 +207,6 @@ GEM rspec-expectations (3.2.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) - rspec-its (1.2.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) rspec-mocks (3.2.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) @@ -286,7 +283,6 @@ DEPENDENCIES pry pry-rails rake - rspec-its rspec-rails (~> 3.0) simplecov (~> 0.7.1) timecop