update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc)
This commit is contained in:
parent
a1c30ac096
commit
2dd0012d1e
4 changed files with 54 additions and 57 deletions
6
Gemfile
6
Gemfile
|
|
@ -82,7 +82,7 @@ gem 'rails-i18n'
|
||||||
# parsing
|
# parsing
|
||||||
|
|
||||||
gem 'nokogiri', '~> 1.5.0'
|
gem 'nokogiri', '~> 1.5.0'
|
||||||
gem 'redcarpet', "2.0.0"
|
gem 'redcarpet', "2.0.1"
|
||||||
gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
|
gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
|
||||||
gem 'ruby-oembed'
|
gem 'ruby-oembed'
|
||||||
|
|
||||||
|
|
@ -134,10 +134,10 @@ group :test do
|
||||||
gem 'fuubar', '0.0.6'
|
gem 'fuubar', '0.0.6'
|
||||||
gem 'mongrel', :require => false, :platforms => :ruby_18
|
gem 'mongrel', :require => false, :platforms => :ruby_18
|
||||||
gem 'rspec', '>= 2.0.0'
|
gem 'rspec', '>= 2.0.0'
|
||||||
gem 'rspec-core', '~> 2.7.1'
|
gem 'rspec-core', '~> 2.8.0'
|
||||||
gem 'rspec-instafail', '>= 0.1.7', :require => false
|
gem 'rspec-instafail', '>= 0.1.7', :require => false
|
||||||
gem 'rspec-rails', '>= 2.0.0'
|
gem 'rspec-rails', '>= 2.0.0'
|
||||||
gem 'selenium-webdriver', '~> 2.15.0'
|
gem 'selenium-webdriver', '~> 2.16.0'
|
||||||
gem 'webmock', :require => false
|
gem 'webmock', :require => false
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
gem 'mock_redis'
|
gem 'mock_redis'
|
||||||
|
|
|
||||||
88
Gemfile.lock
88
Gemfile.lock
|
|
@ -31,7 +31,7 @@ GIT
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/diaspora/diaspora-client.git
|
remote: git://github.com/diaspora/diaspora-client.git
|
||||||
revision: 0c06eaefd3a9de9f4284564ac7fd8398aa1012a7
|
revision: 99dd3728172834b01e2acae0604fe3865456d969
|
||||||
specs:
|
specs:
|
||||||
diaspora-client (0.1.2)
|
diaspora-client (0.1.2)
|
||||||
activerecord
|
activerecord
|
||||||
|
|
@ -110,11 +110,11 @@ GEM
|
||||||
carrierwave (0.5.8)
|
carrierwave (0.5.8)
|
||||||
activesupport (~> 3.0)
|
activesupport (~> 3.0)
|
||||||
cgi_multipart_eof_fix (2.5.0)
|
cgi_multipart_eof_fix (2.5.0)
|
||||||
chef (0.10.4)
|
chef (0.10.8)
|
||||||
bunny (>= 0.6.0)
|
bunny (>= 0.6.0)
|
||||||
erubis
|
erubis
|
||||||
highline
|
highline
|
||||||
json (>= 1.4.4, <= 1.5.2)
|
json (>= 1.4.4, <= 1.6.1)
|
||||||
mixlib-authentication (>= 1.1.0)
|
mixlib-authentication (>= 1.1.0)
|
||||||
mixlib-cli (>= 1.1.0)
|
mixlib-cli (>= 1.1.0)
|
||||||
mixlib-config (>= 1.1.2)
|
mixlib-config (>= 1.1.2)
|
||||||
|
|
@ -126,16 +126,16 @@ GEM
|
||||||
rest-client (>= 1.0.4, < 1.7.0)
|
rest-client (>= 1.0.4, < 1.7.0)
|
||||||
treetop (~> 1.4.9)
|
treetop (~> 1.4.9)
|
||||||
uuidtools
|
uuidtools
|
||||||
childprocess (0.2.3)
|
childprocess (0.2.5)
|
||||||
ffi (~> 1.0.6)
|
ffi (~> 1.0.6)
|
||||||
chronic (0.6.6)
|
chronic (0.6.6)
|
||||||
client_side_validations (3.1.3)
|
client_side_validations (3.1.4)
|
||||||
columnize (0.3.5)
|
columnize (0.3.6)
|
||||||
crack (0.3.1)
|
crack (0.3.1)
|
||||||
cucumber (1.1.3)
|
cucumber (1.1.4)
|
||||||
builder (>= 2.1.2)
|
builder (>= 2.1.2)
|
||||||
diff-lcs (>= 1.1.2)
|
diff-lcs (>= 1.1.2)
|
||||||
gherkin (~> 2.6.7)
|
gherkin (~> 2.7.1)
|
||||||
json (>= 1.4.6)
|
json (>= 1.4.6)
|
||||||
term-ansicolor (>= 1.0.6)
|
term-ansicolor (>= 1.0.6)
|
||||||
cucumber-api-steps (0.6)
|
cucumber-api-steps (0.6)
|
||||||
|
|
@ -145,7 +145,7 @@ GEM
|
||||||
capybara (>= 1.1.2)
|
capybara (>= 1.1.2)
|
||||||
cucumber (>= 1.1.3)
|
cucumber (>= 1.1.3)
|
||||||
nokogiri (>= 1.5.0)
|
nokogiri (>= 1.5.0)
|
||||||
daemons (1.1.4)
|
daemons (1.1.5)
|
||||||
database_cleaner (0.7.0)
|
database_cleaner (0.7.0)
|
||||||
devise (1.3.4)
|
devise (1.3.4)
|
||||||
bcrypt-ruby (~> 2.1.2)
|
bcrypt-ruby (~> 2.1.2)
|
||||||
|
|
@ -157,13 +157,13 @@ GEM
|
||||||
diff-lcs (1.1.3)
|
diff-lcs (1.1.3)
|
||||||
em-synchrony (0.2.0)
|
em-synchrony (0.2.0)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
em-websocket (0.3.5)
|
em-websocket (0.3.6)
|
||||||
addressable (>= 2.1.1)
|
addressable (>= 2.1.1)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
erubis (2.6.6)
|
erubis (2.6.6)
|
||||||
abstract (>= 1.0.0)
|
abstract (>= 1.0.0)
|
||||||
eventmachine (0.12.10)
|
eventmachine (0.12.10)
|
||||||
excon (0.7.12)
|
excon (0.9.4)
|
||||||
factory_girl (2.3.2)
|
factory_girl (2.3.2)
|
||||||
activesupport
|
activesupport
|
||||||
factory_girl_rails (1.4.0)
|
factory_girl_rails (1.4.0)
|
||||||
|
|
@ -181,9 +181,9 @@ GEM
|
||||||
fixture_builder (0.3.1)
|
fixture_builder (0.3.1)
|
||||||
activerecord (>= 2)
|
activerecord (>= 2)
|
||||||
activesupport (>= 2)
|
activesupport (>= 2)
|
||||||
fog (1.1.1)
|
fog (1.1.2)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.7.4)
|
excon (~> 0.9.0)
|
||||||
formatador (~> 0.2.0)
|
formatador (~> 0.2.0)
|
||||||
mime-types
|
mime-types
|
||||||
multi_json (~> 1.0.3)
|
multi_json (~> 1.0.3)
|
||||||
|
|
@ -193,7 +193,7 @@ GEM
|
||||||
ruby-hmac
|
ruby-hmac
|
||||||
foreigner (1.1.1)
|
foreigner (1.1.1)
|
||||||
activerecord (>= 3.0.0)
|
activerecord (>= 3.0.0)
|
||||||
foreman (0.27.0)
|
foreman (0.31.0)
|
||||||
term-ansicolor (~> 1.0.5)
|
term-ansicolor (~> 1.0.5)
|
||||||
thor (>= 0.13.6)
|
thor (>= 0.13.6)
|
||||||
formatador (0.2.1)
|
formatador (0.2.1)
|
||||||
|
|
@ -202,16 +202,16 @@ GEM
|
||||||
rspec-instafail (~> 0.1.8)
|
rspec-instafail (~> 0.1.8)
|
||||||
ruby-progressbar (~> 0.0.10)
|
ruby-progressbar (~> 0.0.10)
|
||||||
gem_plugin (0.2.3)
|
gem_plugin (0.2.3)
|
||||||
gherkin (2.6.9)
|
gherkin (2.7.2)
|
||||||
json (>= 1.4.6)
|
json (>= 1.4.6)
|
||||||
haml (3.1.4)
|
haml (3.1.4)
|
||||||
hashie (1.2.0)
|
hashie (1.2.0)
|
||||||
heroku (2.16.2)
|
heroku (2.17.0)
|
||||||
launchy (>= 0.3.2)
|
launchy (>= 0.3.2)
|
||||||
rest-client (~> 1.6.1)
|
rest-client (~> 1.6.1)
|
||||||
rubyzip
|
rubyzip
|
||||||
term-ansicolor (~> 1.0.5)
|
term-ansicolor (~> 1.0.5)
|
||||||
highline (1.6.8)
|
highline (1.6.9)
|
||||||
hoptoad_notifier (2.4.11)
|
hoptoad_notifier (2.4.11)
|
||||||
activesupport
|
activesupport
|
||||||
builder
|
builder
|
||||||
|
|
@ -254,10 +254,10 @@ GEM
|
||||||
mixlib-cli (1.2.2)
|
mixlib-cli (1.2.2)
|
||||||
mixlib-config (1.1.2)
|
mixlib-config (1.1.2)
|
||||||
mixlib-log (1.3.0)
|
mixlib-log (1.3.0)
|
||||||
mobile-fu (0.2.1)
|
mobile-fu (0.3.0)
|
||||||
rack-mobile-detect
|
rack-mobile-detect
|
||||||
rails
|
rails
|
||||||
mock_redis (0.2.0)
|
mock_redis (0.3.0)
|
||||||
moneta (0.6.0)
|
moneta (0.6.0)
|
||||||
mongrel (1.1.5)
|
mongrel (1.1.5)
|
||||||
cgi_multipart_eof_fix (>= 2.4)
|
cgi_multipart_eof_fix (>= 2.4)
|
||||||
|
|
@ -277,7 +277,7 @@ GEM
|
||||||
net-ssh-multi (1.1)
|
net-ssh-multi (1.1)
|
||||||
net-ssh (>= 2.1.4)
|
net-ssh (>= 2.1.4)
|
||||||
net-ssh-gateway (>= 0.99.0)
|
net-ssh-gateway (>= 0.99.0)
|
||||||
newrelic_rpm (3.3.0)
|
newrelic_rpm (3.3.1)
|
||||||
nokogiri (1.5.0)
|
nokogiri (1.5.0)
|
||||||
oauth (0.4.5)
|
oauth (0.4.5)
|
||||||
oauth2 (0.5.0)
|
oauth2 (0.5.0)
|
||||||
|
|
@ -295,7 +295,7 @@ GEM
|
||||||
omniauth (1.0.1)
|
omniauth (1.0.1)
|
||||||
hashie (~> 1.2)
|
hashie (~> 1.2)
|
||||||
rack
|
rack
|
||||||
omniauth-facebook (1.0.0)
|
omniauth-facebook (1.2.0)
|
||||||
omniauth-oauth2 (~> 1.0.0)
|
omniauth-oauth2 (~> 1.0.0)
|
||||||
omniauth-oauth (1.0.0)
|
omniauth-oauth (1.0.0)
|
||||||
oauth
|
oauth
|
||||||
|
|
@ -310,11 +310,11 @@ GEM
|
||||||
open4 (1.3.0)
|
open4 (1.3.0)
|
||||||
orm_adapter (0.0.5)
|
orm_adapter (0.0.5)
|
||||||
parallel (0.5.11)
|
parallel (0.5.11)
|
||||||
parallel_tests (0.6.11)
|
parallel_tests (0.6.14)
|
||||||
parallel
|
parallel
|
||||||
pg (0.12.2)
|
pg (0.12.2)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
rack (1.2.4)
|
rack (1.2.5)
|
||||||
rack-google-analytics (0.10.0)
|
rack-google-analytics (0.10.0)
|
||||||
rack-mobile-detect (0.3.0)
|
rack-mobile-detect (0.3.0)
|
||||||
rack
|
rack
|
||||||
|
|
@ -341,9 +341,9 @@ GEM
|
||||||
thor (~> 0.14.4)
|
thor (~> 0.14.4)
|
||||||
rake (0.9.2.2)
|
rake (0.9.2.2)
|
||||||
rbx-require-relative (0.0.5)
|
rbx-require-relative (0.0.5)
|
||||||
rdoc (3.11)
|
rdoc (3.12)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (2.0.0)
|
redcarpet (2.0.1)
|
||||||
redis (2.2.2)
|
redis (2.2.2)
|
||||||
redis-namespace (1.0.3)
|
redis-namespace (1.0.3)
|
||||||
redis (< 3.0.0)
|
redis (< 3.0.0)
|
||||||
|
|
@ -359,20 +359,20 @@ GEM
|
||||||
resque (~> 1.0)
|
resque (~> 1.0)
|
||||||
rest-client (1.6.1)
|
rest-client (1.6.1)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
rspec (2.7.0)
|
rspec (2.8.0)
|
||||||
rspec-core (~> 2.7.0)
|
rspec-core (~> 2.8.0)
|
||||||
rspec-expectations (~> 2.7.0)
|
rspec-expectations (~> 2.8.0)
|
||||||
rspec-mocks (~> 2.7.0)
|
rspec-mocks (~> 2.8.0)
|
||||||
rspec-core (2.7.1)
|
rspec-core (2.8.0)
|
||||||
rspec-expectations (2.7.0)
|
rspec-expectations (2.8.0)
|
||||||
diff-lcs (~> 1.1.2)
|
diff-lcs (~> 1.1.2)
|
||||||
rspec-instafail (0.1.9)
|
rspec-instafail (0.1.9)
|
||||||
rspec-mocks (2.7.0)
|
rspec-mocks (2.8.0)
|
||||||
rspec-rails (2.7.0)
|
rspec-rails (2.8.1)
|
||||||
actionpack (~> 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (~> 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (~> 3.0)
|
railties (>= 3.0)
|
||||||
rspec (~> 2.7.0)
|
rspec (~> 2.8.0)
|
||||||
ruby-debug (0.10.4)
|
ruby-debug (0.10.4)
|
||||||
columnize (>= 0.1)
|
columnize (>= 0.1)
|
||||||
ruby-debug-base (~> 0.10.4.0)
|
ruby-debug-base (~> 0.10.4.0)
|
||||||
|
|
@ -393,14 +393,14 @@ GEM
|
||||||
archive-tar-minitar (>= 0.5.2)
|
archive-tar-minitar (>= 0.5.2)
|
||||||
rubyzip (0.9.5)
|
rubyzip (0.9.5)
|
||||||
sass (3.1.11)
|
sass (3.1.11)
|
||||||
selenium-webdriver (2.15.0)
|
selenium-webdriver (2.16.0)
|
||||||
childprocess (>= 0.2.1)
|
childprocess (>= 0.2.5)
|
||||||
ffi (~> 1.0.9)
|
ffi (~> 1.0.9)
|
||||||
multi_json (~> 1.0.4)
|
multi_json (~> 1.0.4)
|
||||||
rubyzip
|
rubyzip
|
||||||
settingslogic (2.0.6)
|
settingslogic (2.0.6)
|
||||||
simple_oauth (0.1.5)
|
simple_oauth (0.1.5)
|
||||||
sinatra (1.2.7)
|
sinatra (1.2.8)
|
||||||
rack (~> 1.1)
|
rack (~> 1.1)
|
||||||
tilt (>= 1.2.2, < 2.0)
|
tilt (>= 1.2.2, < 2.0)
|
||||||
sqlite3 (1.3.5)
|
sqlite3 (1.3.5)
|
||||||
|
|
@ -432,7 +432,7 @@ GEM
|
||||||
webmock (1.6.2)
|
webmock (1.6.2)
|
||||||
addressable (>= 2.2.2)
|
addressable (>= 2.2.2)
|
||||||
crack (>= 0.1.7)
|
crack (>= 0.1.7)
|
||||||
whenever (0.7.0)
|
whenever (0.7.2)
|
||||||
activesupport (>= 2.3.4)
|
activesupport (>= 2.3.4)
|
||||||
chronic (~> 0.6.3)
|
chronic (~> 0.6.3)
|
||||||
will_paginate (3.0.2)
|
will_paginate (3.0.2)
|
||||||
|
|
@ -506,21 +506,21 @@ DEPENDENCIES
|
||||||
rack-piwik
|
rack-piwik
|
||||||
rails (= 3.0.11)
|
rails (= 3.0.11)
|
||||||
rails-i18n
|
rails-i18n
|
||||||
redcarpet (= 2.0.0)
|
redcarpet (= 2.0.1)
|
||||||
resque (= 1.19.0)
|
resque (= 1.19.0)
|
||||||
resque-ensure-connected
|
resque-ensure-connected
|
||||||
resque-timeout (= 1.0.0)
|
resque-timeout (= 1.0.0)
|
||||||
rest-client (= 1.6.1)
|
rest-client (= 1.6.1)
|
||||||
roxml!
|
roxml!
|
||||||
rspec (>= 2.0.0)
|
rspec (>= 2.0.0)
|
||||||
rspec-core (~> 2.7.1)
|
rspec-core (~> 2.8.0)
|
||||||
rspec-instafail (>= 0.1.7)
|
rspec-instafail (>= 0.1.7)
|
||||||
rspec-rails (>= 2.0.0)
|
rspec-rails (>= 2.0.0)
|
||||||
ruby-debug
|
ruby-debug
|
||||||
ruby-debug19
|
ruby-debug19
|
||||||
ruby-oembed
|
ruby-oembed
|
||||||
sass (= 3.1.11)
|
sass (= 3.1.11)
|
||||||
selenium-webdriver (~> 2.15.0)
|
selenium-webdriver (~> 2.16.0)
|
||||||
settingslogic (= 2.0.6)
|
settingslogic (= 2.0.6)
|
||||||
sod!
|
sod!
|
||||||
sqlite3
|
sqlite3
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,7 @@
|
||||||
Feature: editing your profile
|
Feature: editing your profile
|
||||||
Scenario: editing profile fields
|
Scenario: editing profile fields
|
||||||
Given I am signed in
|
Given I am signed in
|
||||||
And I click on my name in the header
|
And I go to the edit profile page
|
||||||
And I follow "Profile"
|
|
||||||
And I follow "Edit my profile"
|
|
||||||
Then I should be on my edit profile page
|
|
||||||
|
|
||||||
When I fill in "profile_gender" with "Fearless"
|
When I fill in "profile_gender" with "Fearless"
|
||||||
And I fill in "profile_first_name" with "Boba"
|
And I fill in "profile_first_name" with "Boba"
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ Feature: Unfollowing
|
||||||
|
|
||||||
Scenario: stop following someone while on the aspect edit page
|
Scenario: stop following someone while on the aspect edit page
|
||||||
When I go to the home page
|
When I go to the home page
|
||||||
And I click on my name in the header
|
And I go to the contacts page
|
||||||
And I follow "Contacts"
|
|
||||||
And I follow "Besties"
|
And I follow "Besties"
|
||||||
And I follow "add contacts to Besties"
|
And I follow "add contacts to Besties"
|
||||||
And I wait for the ajax to finish
|
And I wait for the ajax to finish
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue