Commit 2dd0012d authored by danielgrippi's avatar danielgrippi

update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc)

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