mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-13 01:37:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #170 from fluent/upgrade_rspec_and_capybara

Browse Source 
Upgrade rspec and capybara again
This commit is contained in:
uu59 2015-04-02 14:07:55 +09:00
commit 4ac660521f
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -8,7 +8,7 @@ group :development, :test do
gem "rake" gem "rake"
gem "pry" gem "pry"
gem "pry-rails" gem "pry-rails"
gem "rspec-rails", "~> 2.99" gem "rspec-rails", "~> 3.0"
end end
group :development do group :development do
@ -19,7 +19,7 @@ group :test do
gem "rspec-its" 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.2.1" gem "capybara", "~> 2.4.0"
gem "capybara-screenshot" gem "capybara-screenshot"
gem "simplecov", "~> 0.7.1", require: false gem "simplecov", "~> 0.7.1", require: false
gem "webmock", "~> 1.18.0" gem "webmock", "~> 1.18.0"

40
Gemfile.lock
View File

@ -54,7 +54,7 @@ GEM
addressable (2.3.6) addressable (2.3.6)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
builder (3.2.2) builder (3.2.2)
capybara (2.2.1) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -182,24 +182,26 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.4.2) rake (10.4.2)
request_store (1.1.0) request_store (1.1.0)
rspec-collection_matchers (1.1.2) rspec-core (3.2.2)
rspec-expectations (>= 2.99.0.beta1) rspec-support (~> 3.2.0)
rspec-core (2.99.2) rspec-expectations (3.2.0)
rspec-expectations (2.99.2) diff-lcs (>= 1.2.0, < 2.0)
diff-lcs (>= 1.1.3, < 2.0) rspec-support (~> 3.2.0)
rspec-its (1.0.1) rspec-its (1.0.1)
rspec-core (>= 2.99.0.beta1) rspec-core (>= 2.99.0.beta1)
rspec-expectations (>= 2.99.0.beta1) rspec-expectations (>= 2.99.0.beta1)
rspec-mocks (2.99.3) rspec-mocks (3.2.1)
rspec-rails (2.99.0) diff-lcs (>= 1.2.0, < 2.0)
actionpack (>= 3.0) rspec-support (~> 3.2.0)
activemodel (>= 3.0) rspec-rails (3.2.1)
activesupport (>= 3.0) actionpack (>= 3.0, < 4.3)
railties (>= 3.0) activesupport (>= 3.0, < 4.3)
rspec-collection_matchers railties (>= 3.0, < 4.3)
rspec-core (~> 2.99.0) rspec-core (~> 3.2.0)
rspec-expectations (~> 2.99.0) rspec-expectations (~> 3.2.0)
rspec-mocks (~> 2.99.0) rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rubyzip (1.1.7) rubyzip (1.1.7)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.2.19) sass (3.2.19)
@ -228,7 +230,7 @@ GEM
sucker_punch (1.0.5) sucker_punch (1.0.5)
celluloid (~> 0.15.2) celluloid (~> 0.15.2)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.1) timecop (0.7.1)
timers (1.1.0) timers (1.1.0)
@ -254,7 +256,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
capybara (~> 2.2.1) capybara (~> 2.4.0)
capybara-screenshot capybara-screenshot
database_cleaner (~> 1.2.0) database_cleaner (~> 1.2.0)
factory_girl_rails factory_girl_rails
@ -265,7 +267,7 @@ DEPENDENCIES
pry-rails pry-rails
rake rake
rspec-its rspec-its
rspec-rails (~> 2.99) rspec-rails (~> 3.0)
simplecov (~> 0.7.1) simplecov (~> 0.7.1)
timecop timecop
webmock (~> 1.18.0) webmock (~> 1.18.0)