Commit 4ae26e1d authored by cmrd Senya's avatar cmrd Senya

Upgrade devise to 4.2

parent c1bd072e
......@@ -23,9 +23,9 @@ gem "json-schema", "2.6.2"
# Authentication
gem "devise", "3.5.6"
gem "devise", "4.2.0"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "0.4.6"
gem "devise-token_authenticatable", "0.5.2"
# Captcha
......
......@@ -165,15 +165,14 @@ GEM
railties (>= 3, < 5)
cucumber-wire (0.0.1)
database_cleaner (1.5.3)
devise (3.5.6)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0, < 5.1)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-token_authenticatable (0.4.6)
devise (>= 3.5.2, < 4.0.0)
devise-token_authenticatable (0.5.2)
devise (>= 4.0.0, < 4.3.0)
devise_lastseenable (0.0.6)
devise
rails (>= 3.0.4)
......@@ -927,8 +926,8 @@ DEPENDENCIES
cucumber-api-steps (= 0.13)
cucumber-rails (= 1.4.3)
database_cleaner (= 1.5.3)
devise (= 3.5.6)
devise-token_authenticatable (= 0.4.6)
devise (= 4.2.0)
devise-token_authenticatable (= 0.5.2)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.1.3)
......
This diff is collapsed.
......@@ -6,7 +6,7 @@ describe Admin::PodsController, type: :controller do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
describe "#index" do
......
......@@ -6,7 +6,7 @@ describe Admin::UsersController, :type => :controller do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
describe '#close_account' do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe AdminsController, :type => :controller do
before do
@user = FactoryGirl.create :user
sign_in :user, @user
sign_in @user, scope: :user
end
describe '#user_search' do
......
......@@ -6,7 +6,7 @@ describe Api::OpenidConnect::AuthorizationsController, type: :controller do
let!(:client_with_multiple_redirects) { FactoryGirl.create(:o_auth_application_with_multiple_redirects) }
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe "#new" do
......
......@@ -5,7 +5,7 @@ describe Api::OpenidConnect::UserApplicationsController, type: :controller do
@app = FactoryGirl.create(:o_auth_application_with_xss)
@user = FactoryGirl.create :user
FactoryGirl.create :auth_with_read, user: @user, o_auth_application: @app
sign_in :user, @user
sign_in @user, scope: :user
end
context "when try to XSS" do
......
......@@ -13,7 +13,7 @@ describe AspectMembershipsController, type: :controller do
@contact = alice.contact_for(bob.person)
alice.getting_started = false
alice.save
sign_in :user, alice
sign_in alice, scope: :user
allow(@controller).to receive(:current_user).and_return(alice)
request.env["HTTP_REFERER"] = "http://" + request.host
end
......
......@@ -8,7 +8,7 @@ describe AspectsController, :type => :controller do
before do
alice.getting_started = false
alice.save
sign_in :user, alice
sign_in alice, scope: :user
@alices_aspect_1 = alice.aspects.where(:name => "generic").first
@alices_aspect_2 = alice.aspects.create(:name => "another aspect")
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe CommentsController, :type => :controller do
before do
allow(@controller).to receive(:current_user).and_return(alice)
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#create' do
......@@ -79,7 +79,7 @@ describe CommentsController, :type => :controller do
context 'your post' do
before do
allow(@controller).to receive(:current_user).and_return(bob)
sign_in :user, bob
sign_in bob, scope: :user
end
it 'lets the user delete his comment' do
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe ContactsController, :type => :controller do
before do
sign_in :user, bob
sign_in bob, scope: :user
allow(@controller).to receive(:current_user).and_return(bob)
end
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe ConversationVisibilitiesController, :type => :controller do
before do
@user1 = alice
sign_in :user, @user1
sign_in @user1, scope: :user
hash = {
:author => @user1.person,
......@@ -27,22 +27,22 @@ describe ConversationVisibilitiesController, :type => :controller do
it 'does not let a user destroy a visibility that is not theirs' do
user2 = eve
sign_in :user, user2
sign_in user2, scope: :user
expect {
delete :destroy, :conversation_id => @conversation.id
}.not_to change(ConversationVisibility, :count)
end
it 'returns "hidden"' do
get :destroy, :conversation_id => @conversation.id
expect(flash.notice).to include("hidden")
end
it 'returns "deleted" when last participant' do
get :destroy, :conversation_id => @conversation.id
sign_out :user
sign_in :user, bob
sign_in bob, scope: :user
get :destroy, :conversation_id => @conversation.id
expect(flash.notice).to include("deleted")
end
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe ConversationsController, :type => :controller do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#new' do
......@@ -98,7 +98,7 @@ describe ConversationsController, :type => :controller do
end
it "does not let you access conversations where you are not a recipient" do
sign_in :user, eve
sign_in eve, scope: :user
get :index, conversation_id: @conversations.first.id
expect(assigns[:conversation]).to be_nil
end
......
......@@ -14,7 +14,7 @@ describe InvitationsController, :type => :controller do
describe "#create" do
before do
sign_in :user, @user
sign_in @user, scope: :user
allow(@controller).to receive(:current_user).and_return(@user)
@referer = 'http://test.host/cats/foo'
request.env["HTTP_REFERER"] = @referer
......@@ -159,7 +159,7 @@ describe InvitationsController, :type => :controller do
describe '#new' do
it 'renders' do
sign_in :user, @user
sign_in @user, scope: :user
get :new
end
end
......
......@@ -5,7 +5,7 @@ describe AdminsController, type: :controller do
before do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
context "jasmine fixtures" do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe StreamsController, :type => :controller do
describe '#aspects' do
before do
sign_in :user, alice
sign_in alice, scope: :user
@alices_aspect_2 = alice.aspects.create(:name => "another aspect")
request.env["HTTP_REFERER"] = 'http://' + request.host
......
......@@ -11,7 +11,7 @@ describe ContactsController, :type => :controller do
@aspect = bob.aspects.create(:name => "another aspect")
bob.share_with alice.person, @aspect
bob.share_with eve.person, @aspect
sign_in :user, bob
sign_in bob, scope: :user
end
it "generates the aspects_manage fixture", :fixture => true do
......
......@@ -20,7 +20,7 @@ describe ConversationsController, :type => :controller do
Message.create(:author => @person, :created_at => Time.now + 100, :text => "message", :conversation_id => @conv2.id)
.increase_unread(alice)
sign_in :user, alice
sign_in alice, scope: :user
end
it "generates a jasmine fixture", :fixture => true do
......
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe NotificationsController, :type => :controller do
describe '#index' do
before do
sign_in :user, alice
sign_in alice, scope: :user
@post = FactoryGirl.create(:status_message)
FactoryGirl.create(:notification, :recipient => alice, :target => @post)
get :read_all
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe PeopleController, :type => :controller do
describe '#index' do
before do
sign_in :user, bob
sign_in bob, scope: :user
end
it "generates a jasmine fixture with no query", :fixture => true do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe PhotosController, :type => :controller do
before do
@alices_photo = alice.post(:photo, :user_file => uploaded_photo, :to => alice.aspects.first.id, :public => false)
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#index' do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe StatusMessagesController, :type => :controller do
describe '#bookmarklet' do
before do
sign_in :user, bob
sign_in bob, scope: :user
end
it "generates a jasmine fixture", :fixture => true do
......@@ -19,7 +19,7 @@ describe StatusMessagesController, :type => :controller do
describe '#new' do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it 'generates a jasmine fixture', :fixture => true do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe StreamsController, :type => :controller do
describe '#multi' do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it 'generates the stream_json fixture', :fixture => true do
......
......@@ -2,7 +2,7 @@ require "spec_helper"
describe UsersController, type: :controller do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe "#getting_started" do
......
......@@ -9,7 +9,7 @@ describe LikesController, :type => :controller do
@alices_aspect = alice.aspects.where(:name => "generic").first
@bobs_aspect = bob.aspects.where(:name => "generic").first
sign_in :user, alice
sign_in(alice, scope: :user)
end
[Comment, Post].each do |class_const|
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe MessagesController, :type => :controller do
before do
sign_in :user, alice
sign_in(alice, scope: :user)
end
describe '#create' do
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe NotificationsController, :type => :controller do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#update' do
......
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe ParticipationsController, :type => :controller do
before do
allow(@controller).to receive(:current_user).and_return(alice)
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#create' do
......
......@@ -5,8 +5,6 @@
require "spec_helper"
describe Devise::PasswordsController, type: :controller do
include Devise::TestHelpers
before do
@request.env["devise.mapping"] = Devise.mappings[:user]
end
......
......@@ -10,7 +10,7 @@ describe PeopleController, :type => :controller do
before do
@user = alice
@aspect = @user.aspects.first
sign_in :user, @user
sign_in @user, scope: :user
end
describe '#index (search)' do
......@@ -315,7 +315,7 @@ describe PeopleController, :type => :controller do
context "when the user is following the person" do
before do
sign_out :user
sign_in :user, peter
sign_in peter, scope: :user
@person = alice.person
end
......
......@@ -9,7 +9,7 @@ describe PhotosController, :type => :controller do
@alices_photo = alice.post(:photo, :user_file => uploaded_photo, :to => alice.aspects.first.id, :public => false)
@bobs_photo = bob.post(:photo, :user_file => uploaded_photo, :to => bob.aspects.first.id, :public => true)
sign_in :user, alice
sign_in alice, scope: :user
request.env["HTTP_REFERER"] = ''
end
......
......@@ -11,7 +11,7 @@ describe PostsController, type: :controller do
context "user signed in" do
context "given a post that the user is allowed to see" do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it "succeeds" do
......@@ -50,7 +50,7 @@ describe PostsController, type: :controller do
context "given a post that the user is not allowed to see" do
before do
sign_in :user, eve
sign_in eve, scope: :user
end
it "returns a 404" do
......@@ -128,7 +128,7 @@ describe PostsController, type: :controller do
context "post of another user" do
it "will respond with a 403" do
sign_in :user, bob
sign_in bob, scope: :user
delete :destroy, format: :json, id: post.id
expect(response.body).to eq("You are not allowed to do that")
......@@ -136,7 +136,7 @@ describe PostsController, type: :controller do
end
it "will respond with a 404 if the post is not visible" do
sign_in :user, eve
sign_in eve, scope: :user
expect {
delete :destroy, format: :json, id: post.id
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe ProfilesController, :type => :controller do
before do
sign_in :user, eve
sign_in eve, scope: :user
end
describe '#show' do
......
......@@ -4,9 +4,7 @@
require 'spec_helper'
describe RegistrationsController, :type => :controller do
include Devise::TestHelpers
describe RegistrationsController, type: :controller do
before do
request.env["devise.mapping"] = Devise.mappings[:user]
@valid_params = {:user => {
......
......@@ -18,7 +18,7 @@ describe ResharesController, :type => :controller do
context 'with an authenticated user' do
before do
sign_in :user, bob
sign_in(bob, scope: :user)
allow(@controller).to receive(:current_user).and_return(bob)
end
......
......@@ -4,7 +4,7 @@ describe SearchController, :type => :controller do
before do
@user = alice
@aspect = @user.aspects.first
sign_in :user, @user
sign_in @user, scope: :user
end
describe 'query is a person' do
......@@ -23,7 +23,7 @@ describe SearchController, :type => :controller do
get :search, :q => '#cats'
expect(response).to redirect_to(tag_path('cats'))
end
it 'removes dots from the query' do
get :search, :q => '#cat.s'
expect(response).to redirect_to(tag_path('cats'))
......
......@@ -14,7 +14,7 @@ describe ServicesController, :type => :controller do
let(:user) { alice }
before do
sign_in :user, user
sign_in user, scope: :user
allow(@controller).to receive(:current_user).and_return(user)
end
......@@ -75,11 +75,11 @@ describe ServicesController, :type => :controller do
context 'when the access-level is read-only' do
let(:header) { { 'x-access-level' => 'read' } }
let(:access_token) { double('access_token') }
let(:access_token) { double("access_token") }
let(:extra) { {'extra' => { 'access_token' => access_token }} }
let(:provider) { {'provider' => 'twitter'} }
before do
before do
allow(access_token).to receive_message_chain(:response, :header).and_return header
request.env['omniauth.auth'] = omniauth_auth.merge!( provider).merge!( extra )
end
......
......@@ -5,8 +5,6 @@
require "spec_helper"
describe SessionsController, type: :controller do
include Devise::TestHelpers
let(:mock_access_token) { Object.new }
before do
......@@ -34,7 +32,7 @@ describe SessionsController, type: :controller do
describe "#destroy" do
before do
sign_in :user, @user
sign_in @user, scope: :user
end
it "redirects to / for a non-mobile user" do
delete :destroy
......@@ -51,7 +49,7 @@ describe SessionsController, type: :controller do
describe "#reset_authentication_token" do
context "for a logged in user" do
before do
sign_in :user, @user
sign_in @user, scope: :user
end
it "succeeds" do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe ShareVisibilitiesController, :type => :controller do
before do
@status = alice.post(:status_message, :text => "hello", :to => alice.aspects.first)
sign_in :user, bob
sign_in(bob, scope: :user)
end
describe '#update' do
......
......@@ -9,7 +9,7 @@ describe StatusMessagesController, :type => :controller do
@aspect1 = alice.aspects.first
request.env["HTTP_REFERER"] = ""
sign_in :user, alice
sign_in alice, scope: :user
allow(@controller).to receive(:current_user).and_return(alice)
alice.reload
end
......
......@@ -15,7 +15,7 @@ describe TagFollowingsController, type: :controller do
end
context "signed in" do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it "redirects html requests" do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe TagsController, :type => :controller do
describe '#index (search)' do
before do
sign_in :user, alice
sign_in alice, scope: :user
bob.profile.tag_string = "#cats #diaspora #rad"
bob.profile.build_tags
bob.profile.save!
......@@ -38,7 +38,7 @@ describe TagsController, :type => :controller do
describe '#show' do
context 'tag with capital letters' do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it 'redirect to the downcase tag uri' do
......@@ -67,7 +67,7 @@ describe TagsController, :type => :controller do
context 'signed in' do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
it 'assigns a Stream::Tag object with the current_user' do
......
......@@ -9,7 +9,7 @@ describe UsersController, :type => :controller do
before do
@user = alice
sign_in :user, @user
sign_in @user, scope: :user
allow(@controller).to receive(:current_user).and_return(@user)
end
......@@ -186,7 +186,7 @@ describe UsersController, :type => :controller do
end
it 'informs the user about failure' do
put(:update, :id => @user.id, :user => { :email => "my@newemailcom"})
put(:update, id: @user.id, user: {email: "mynewemailcom"})
expect(request.flash[:error]).to eql(I18n.t('users.update.unconfirmed_email_not_changed'))
expect(request.flash[:notice]).to be_blank
end
......
require 'spec_helper'
describe InterimStreamHackinessHelper, :type => :helper do
describe 'commenting_disabled?' do
include Devise::TestHelpers
describe InterimStreamHackinessHelper, type: :helper do
describe "commenting_disabled?" do
include Devise::Test::ControllerHelpers
before do
sign_in alice
def user_signed_in?
......