Skip to content

Commit

Permalink
updates gems
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Renan committed Jan 13, 2012
1 parent 5464990 commit 732f9f2
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 76 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source "http://rubygems.org"

group :development, :test do
gem "rails", "3.0.10"
gem "capybara", "~> 1.0.1"
gem "rails", "3.0.11"
gem "capybara", "~> 1.1"
gem "rspec-rails", "~> 2.6"
gem "simplecov", :require => false
gem "factory_girl_rails"
Expand Down
145 changes: 74 additions & 71 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,131 +2,134 @@ PATH
remote: .
specs:
couchrest_model_slug (0.0.2)
couchrest_model (~> 1.1.0)
stringex (~> 1.2.1)
couchrest_model (~> 1.1.2)
stringex (~> 1.3)

GEM
remote: http://rubygems.org/
specs:
ZenTest (4.5.0)
ZenTest (4.6.2)
abstract (1.0.0)
actionmailer (3.0.10)
actionpack (= 3.0.10)
actionmailer (3.0.11)
actionpack (= 3.0.11)
mail (~> 2.2.19)
actionpack (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
actionpack (3.0.11)
activemodel (= 3.0.11)
activesupport (= 3.0.11)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.10)
activesupport (= 3.0.10)
activemodel (3.0.11)
activesupport (= 3.0.11)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activerecord (3.0.11)
activemodel (= 3.0.11)
activesupport (= 3.0.11)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activeresource (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activesupport (3.0.10)
activeresource (3.0.11)
activemodel (= 3.0.11)
activesupport (= 3.0.11)
activesupport (3.0.11)
arel (2.0.10)
builder (2.1.2)
capybara (1.0.1)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.2.1)
childprocess (0.2.9)
ffi (~> 1.0.6)
couchrest (1.1.0)
couchrest (1.1.2)
mime-types (~> 1.15)
multi_json (~> 1.0.0)
rest-client (~> 1.6.1)
couchrest_model (1.1.0)
couchrest_model (1.1.2)
activemodel (~> 3.0)
couchrest (= 1.1.0)
couchrest (~> 1.1.2)
mime-types (~> 1.15)
tzinfo (~> 0.3.22)
diff-lcs (1.1.2)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
factory_girl (2.3.2)
activesupport
factory_girl_rails (1.4.0)
factory_girl (~> 2.3.0)
railties (>= 3.0.0)
ffaker (1.8.0)
ffi (1.0.9)
ffaker (1.12.1)
ffi (1.0.11)
i18n (0.5.0)
json_pure (1.5.1)
json (1.6.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (1.0.3)
nokogiri (1.4.4)
polyglot (0.3.2)
rack (1.2.3)
mime-types (1.17.2)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.10)
actionmailer (= 3.0.10)
actionpack (= 3.0.10)
activerecord (= 3.0.10)
activeresource (= 3.0.10)
activesupport (= 3.0.10)
rails (3.0.11)
actionmailer (= 3.0.11)
actionpack (= 3.0.11)
activerecord (= 3.0.11)
activeresource (= 3.0.11)
activesupport (= 3.0.11)
bundler (~> 1.0)
railties (= 3.0.10)
railties (3.0.10)
actionpack (= 3.0.10)
activesupport (= 3.0.10)
railties (= 3.0.11)
railties (3.0.11)
actionpack (= 3.0.11)
activesupport (= 3.0.11)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.9.2)
rest-client (1.6.3)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.3)
rspec-expectations (2.6.0)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
selenium-webdriver (2.4.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rspec-mocks (2.8.0)
rspec-rails (2.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
rubyzip (0.9.5)
selenium-webdriver (2.16.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
simplecov (0.4.2)
simplecov-html (~> 0.4.4)
simplecov-html (0.4.5)
stringex (1.2.1)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
stringex (1.3.0)
thor (0.14.6)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
tzinfo (0.3.31)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand All @@ -135,10 +138,10 @@ PLATFORMS

DEPENDENCIES
ZenTest
capybara (~> 1.0.1)
capybara (~> 1.1)
couchrest_model_slug!
factory_girl_rails
ffaker
rails (= 3.0.10)
rails (= 3.0.11)
rspec-rails (~> 2.6)
simplecov
4 changes: 2 additions & 2 deletions couchrest_model_slug.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "couchrest_model", "~> 1.1.0"
s.add_dependency "stringex", "~> 1.2.1"
s.add_dependency "couchrest_model", "~> 1.1.2"
s.add_dependency "stringex", "~> 1.3"
end
2 changes: 1 addition & 1 deletion spec/integration/navigation_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'spec_helper'

describe "Navigation" do
include Capybara
include Capybara::DSL

it "should be a valid app" do
::Rails.application.should be_a(Dummy::Application)
Expand Down

0 comments on commit 732f9f2

Please sign in to comment.