Add instagram background implementation and generalize application for other identity providers

This commit is contained in:
2014-12-22 15:34:23 +01:00
parent 82b1585b30
commit 22bbe5bbfa
29 changed files with 122 additions and 90 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ step "the user should be redirected to the archived list path" do
end
step 'there is another user' do
@other_user ||= create :user
@other_user ||= create :user, :other_auth
end
step "the other user clicks the join table button" do
@@ -4,7 +4,7 @@ step "the original user should see a join request message" do
request_title = page.evaluate_script(%|t('join_request.existing_user.title')|)
request_title.should be_present
page.should have_content request_title
page.should have_content @other_user.email
page.should have_content "UOther" # spec/factories/user
end
step "the original user should not see the join request anymore" do
+14
View File
@@ -2,5 +2,19 @@ FactoryGirl.define do
factory :user do
sequence( :email ){|i| "test#{i}@example.com" }
password "secret"
trait :other_auth do
auth_data( {
'info' => {
'nickname' => "UOther",
"name" => "USR Other",
"first_name" => "Usother"
},
"credentials" => {
"token" => "fbAuthToken234",
'expires' => false
}
})
end
end
end
+4
View File
@@ -56,6 +56,10 @@ class TestCounter < InMemoryQCounter
#end
end
# No external images in test suite... slow....
User.send(:define_method, :avatar, ->{})
if defined?(Couchbase)
class Couchbase::View
alias :old_initialize :initialize