Merge pull request #172 from fluent/remove_rspec_its

Remove rspec-its gem
This commit is contained in:
uu59 2015-04-02 16:29:08 +09:00
commit b8fda0f15b
4 changed files with 9 additions and 9 deletions

View File

@ -16,7 +16,6 @@ group :development do
end end
group :test do group :test do
gem "rspec-its"
gem "factory_girl_rails" gem "factory_girl_rails"
gem "database_cleaner", "~> 1.2.0" gem "database_cleaner", "~> 1.2.0"
gem "capybara", "~> 2.4.0" gem "capybara", "~> 2.4.0"

View File

@ -207,9 +207,6 @@ GEM
rspec-expectations (3.2.0) rspec-expectations (3.2.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.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) rspec-mocks (3.2.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0) rspec-support (~> 3.2.0)
@ -286,7 +283,6 @@ DEPENDENCIES
pry pry
pry-rails pry-rails
rake rake
rspec-its
rspec-rails (~> 3.0) rspec-rails (~> 3.0)
simplecov (~> 0.7.1) simplecov (~> 0.7.1)
timecop timecop

View File

@ -13,21 +13,27 @@ describe 'Fluentd::Agent::Common' do
describe '#pid' do describe '#pid' do
context 'no pid file exists' 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 end
context 'empty pid file given' do context 'empty pid file given' do
before { FileUtils.touch pid_file_path } before { FileUtils.touch pid_file_path }
after { FileUtils.rm 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 end
context 'valid pid file given' do context 'valid pid file given' do
before { File.write pid_file_path, '9999' } before { File.write pid_file_path, '9999' }
after { FileUtils.rm pid_file_path } 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
end end

View File

@ -12,7 +12,6 @@ end
ENV["RAILS_ENV"] ||= 'test' ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__) require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails' require 'rspec/rails'
require 'rspec/its'
require 'webmock/rspec' require 'webmock/rspec'
WebMock.disable_net_connect!(allow_localhost: true) WebMock.disable_net_connect!(allow_localhost: true)
require 'capybara/poltergeist' require 'capybara/poltergeist'