nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6959 from cmrd-senya/devise-upgrade

Browse source 
Upgrade devise to 4.2
This commit is contained in:
Jonne Haß 2016-08-11 12:08:42 +02:00 committed by GitHub
commit 7fa299b7ad
52 changed files with 202 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -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

13
Gemfile.lock
View file

@ -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)

191
config/locales/devise/devise.en.yml
View file

@ -1,88 +1,129 @@
en:
errors:
messages:
not_found: "not found"
already_confirmed: "was already confirmed"
not_locked: "was not locked"
devise:
failure:
unauthenticated: 'You need to sign in or sign up before continuing.'
unconfirmed: 'You have to confirm your account before continuing.'
locked: 'Your account is locked.'
not_found_in_database: 'Invalid email or password.'
invalid: 'Invalid username or password.'
invalid_token: 'Invalid authentication token.'
timeout: 'Your session expired, please sign in again to continue.'
inactive: 'Your account was not activated yet.'
sessions:
new:
login: 'Log in'
username: 'Username'
password: 'Password'
sign_in: 'Sign in'
remember_me: "Remember me"
modern_browsers: 'only supports modern browsers.'
signed_in: 'Signed in successfully.'
signed_out: 'Signed out successfully.'
passwords:
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
updated: 'Your password was changed successfully. You are now signed in.'
edit:
change_password: "Change my password"
new_password: "New password"
confirm_password: "Confirm password"
new:
forgot_password: "Forgot your password?"
no_account: 'No account with this email exists'
reset_password: "Reset password"
email: "Email address"
send_password_instructions: "Send me reset password instructions"
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
confirmed: 'Your account was successfully confirmed. You are now signed in.'
confirmed: Your email address has been successfully confirmed.
send_instructions: You will receive an email with instructions for how to confirm
your email address in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you
will receive an email with instructions for how to confirm your email address
in a few minutes.
new:
resend_confirmation: "Resend confirmation instructions"
registrations:
signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully deleted. We hope to see you again soon.'
unlocks:
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
unlocked: 'Your account was successfully unlocked. You are now signed in.'
new:
resend_unlock: "Resend unlock instructions"
invitations:
send_instructions: 'Your invitation has been sent.'
invitation_token_invalid: 'Our apologies! That invitation token is not valid.'
updated: 'Your password was set successfully. You are now signed in.'
resend_confirmation: Resend confirmation instructions
failure:
already_authenticated: You are already signed in.
inactive: Your account is not activated yet.
invalid: Invalid %{authentication_keys} or password.
locked: Your account is locked.
last_attempt: You have one more attempt before your account is locked.
not_found_in_database: Invalid %{authentication_keys} or password.
timeout: Your session expired. Please sign in again to continue.
unauthenticated: You need to sign in or sign up before continuing.
unconfirmed: You have to confirm your email address before continuing.
invalid_token: Invalid authentication token.
mailer:
welcome: "Welcome %{email}!"
hello: "Hello %{email}!"
confirmation_instructions:
subject: 'Confirmation instructions'
you_can_confirm: "You can confirm your account through the link below:"
confirm: "Confirm my account"
subject: Confirmation instructions
you_can_confirm: 'You can confirm your account through the link below:'
confirm: Confirm my account
reset_password_instructions:
subject: 'Reset password instructions'
someone_requested: "Someone has requested a link to change your password. If it was you, you can do this through the link below."
change: "Change my password"
wont_change: "Your password won't change until you access the link above and create a new one."
ignore: "If you didn't request this, please ignore this email."
subject: Reset password instructions
someone_requested: Someone has requested a link to change your password. If
it was you, you can do this through the link below.
change: Change my password
wont_change: Your password won't change until you access the link above and
create a new one.
ignore: If you didn't request this, please ignore this email.
unlock_instructions:
subject: 'Unlock instructions'
account_locked: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
click_to_unlock: "Click the link below to unlock your account:"
unlock: "Unlock my account"
subject: Unlock instructions
account_locked: Your account has been locked due to an excessive number of
unsuccessful sign in attempts.
click_to_unlock: 'Click the link below to unlock your account:'
unlock: Unlock my account
password_change:
subject: Password Changed
welcome: Welcome %{email}!
hello: Hello %{email}!
inviter:
has_invited_you: "%{name}"
have_invited_you: "%{names} have invited you to join diaspora*"
accept_at: "at %{url}, you can accept it through the link below."
accept_at: at %{url}, you can accept it through the link below.
omniauth_callbacks:
failure: Could not authenticate you from %{kind} because "%{reason}".
success: Successfully authenticated from %{kind} account.
passwords:
no_token: You can't access this page without coming from a password reset email.
If you do come from a password reset email, please make sure you used the
full URL provided.
send_instructions: You will receive an email with instructions on how to reset
your password in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you
will receive a password recovery link at your email address in a few minutes.
updated: Your password has been changed successfully. You are now signed in.
updated_not_active: Your password has been changed successfully.
edit:
change_password: Change my password
new_password: New password
confirm_password: Confirm password
new:
forgot_password: Forgot your password?
no_account: No account with this email exists
reset_password: Reset password
email: Email address
send_password_instructions: Send me reset password instructions
registrations:
destroyed: Bye! Your account was successfully deleted. We hope to see you again
soon.
signed_up: You have signed up successfully. If enabled, a confirmation was sent
to your e-mail.
signed_up_but_inactive: You have signed up successfully. However, we could not
sign you in because your account is not yet activated.
signed_up_but_locked: You have signed up successfully. However, we could not
sign you in because your account is locked.
signed_up_but_unconfirmed: A message with a confirmation link has been sent
to your email address. Please follow the link to activate your account.
update_needs_confirmation: You updated your account successfully, but we need
to verify your new email address. Please check your email and follow the confirm
link to confirm your new email address.
updated: Your account has been updated successfully.
sessions:
signed_in: Signed in successfully.
signed_out: Signed out successfully.
already_signed_out: Signed out successfully.
new:
login: Log in
username: Username
password: Password
sign_in: Sign in
remember_me: Remember me
modern_browsers: only supports modern browsers.
unlocks:
send_instructions: You will receive an email with instructions for how to unlock
your account in a few minutes.
send_paranoid_instructions: If your account exists, you will receive an email
with instructions for how to unlock it in a few minutes.
unlocked: Your account has been unlocked successfully. Please sign in to continue.
new:
resend_unlock: Resend unlock instructions
invitations:
send_instructions: Your invitation has been sent.
invitation_token_invalid: Our apologies! That invitation token is not valid.
updated: Your password was set successfully. You are now signed in.
shared:
links:
sign_in: 'Sign in'
sign_up: 'Create account'
sign_up_closed: 'Open signups are closed at this time.'
forgot_your_password: 'Forgot your password?'
receive_confirmation: "Didn't receive confirmation instructions?"
receive_unlock: "Didn't receive unlock instructions?"
sign_in: Sign in
sign_up: Create account
sign_up_closed: Open signups are closed at this time.
forgot_your_password: Forgot your password?
receive_confirmation: Didn't receive confirmation instructions?
receive_unlock: Didn't receive unlock instructions?
errors:
messages:
already_confirmed: was already confirmed, please try signing in
confirmation_period_expired: needs to be confirmed within %{period}, please
request a new one
expired: has expired, please request a new one
not_found: not found
not_locked: was not locked
not_saved:
one: '1 error prohibited this %{resource} from being saved:'
other: "%{count} errors prohibited this %{resource} from being saved:"

2
spec/controllers/admin/pods_controller_spec.rb
View file

@ -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

2
spec/controllers/admin/users_controller_spec.rb
View file

@ -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

2
spec/controllers/admins_controller_spec.rb
View file

@ -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

2
spec/controllers/api/openid_connect/authorizations_controller_spec.rb
View file

@ -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

2
spec/controllers/api/openid_connect/user_applications_spec.rb
View file

@ -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

2
spec/controllers/aspect_memberships_controller_spec.rb
View file

@ -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

2
spec/controllers/aspects_controller_spec.rb
View file

@ -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")

4
spec/controllers/comments_controller_spec.rb
View file

@ -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

2
spec/controllers/contacts_controller_spec.rb
View file

@ -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

10
spec/controllers/conversation_visibilities_controller_spec.rb
View file

@ -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

4
spec/controllers/conversations_controller_spec.rb
View file

@ -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

4
spec/controllers/invitations_controller_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/admins_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/aspects_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/contacts_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/conversations_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/notifications_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/people_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/photos_spec.rb
View file

@ -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

4
spec/controllers/jasmine_fixtures/status_messages_spec.rb
View file

@ -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

2
spec/controllers/jasmine_fixtures/streams_spec.rb
View file

@ -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
spec/controllers/jasmine_fixtures/users_spec.rb
View file

@ -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

2
spec/controllers/likes_controller_spec.rb
View file

@ -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|

2
spec/controllers/messages_controller_spec.rb
View file

@ -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

2
spec/controllers/notifications_controller_spec.rb
View file

@ -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

2
spec/controllers/participations_controller_spec.rb
View file

@ -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

2
spec/controllers/passwords_controller_spec.rb
View file

@ -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

4
spec/controllers/people_controller_spec.rb
View file

@ -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

2
spec/controllers/photos_controller_spec.rb
View file

@ -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

8
spec/controllers/posts_controller_spec.rb
View file

@ -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

2
spec/controllers/profiles_controller_spec.rb
View file

@ -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
spec/controllers/registrations_controller_spec.rb
View file

@ -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 => {

2
spec/controllers/reshares_controller_spec.rb
View file

@ -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
spec/controllers/search_controller_spec.rb
View file

@ -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'))

6
spec/controllers/services_controller_spec.rb
View file

@ -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

6
spec/controllers/sessions_controller_spec.rb
View file

@ -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

2
spec/controllers/share_visibilities_controller_spec.rb
View file

@ -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

2
spec/controllers/status_messages_controller_spec.rb
View file

@ -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

2
spec/controllers/tag_followings_controller_spec.rb
View file

@ -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

6
spec/controllers/tags_controller_spec.rb
View file

@ -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

4
spec/controllers/users_controller_spec.rb
View file

@ -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
@ -181,7 +181,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

7
spec/helpers/interim_stream_hackiness_helper_spec.rb
View file

@ -1,8 +1,9 @@
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?

4
spec/helpers/users_helper_spec.rb
View file

@ -1,7 +1,7 @@
require "spec_helper"
describe UsersHelper, :type => :helper do
include Devise::TestHelpers
describe UsersHelper, type: :helper do
include Devise::Test::ControllerHelpers
describe "#current_color_theme" do
describe "if user is not signed in" do

3
spec/integration/mentioning_spec.rb
View file

@ -1,5 +1,4 @@
require "spec_helper"
require "requests_helper"
module MentioningSpecHelpers
def default_aspect
@ -35,7 +34,7 @@ describe "mentioning", type: :request do
@user3 = FactoryGirl.create :user
@user1.share_with(@user2.person, default_aspect)
login @user1
sign_in @user1
end
# see: https://github.com/diaspora/diaspora/issues/4160

5
spec/integration/profile_spec.rb
View file

@ -1,10 +1,9 @@
require "spec_helper"
require "requests_helper"
describe PeopleController, type: :request do
context "for the current user" do
before do
login alice
sign_in alice
end
it "displays the publisher for user profile path" do
@ -37,7 +36,7 @@ describe PeopleController, type: :request do
context "for another user" do
before do
login bob
sign_in bob
end
it "doesn't display the publisher for user profile path" do

10
spec/lib/i18n_interpolation_fallbacks_spec.rb
View file

@ -7,10 +7,12 @@ require 'spec_helper'
describe "i18n interpolation fallbacks" do
describe "when string does not require interpolation arguments" do
it "works normally" do
expect(I18n.t('user.invalid',
:resource_name => "user",
:scope => "devise.failure",
:default => [:invalid, "invalid"])).to eq("Invalid username or password.")
expect(
I18n.t("user.already_authenticated",
resource_name: "user",
scope: "devise.failure",
default: [:already_authenticated, "already_authenticated"])
).to eq("You are already signed in.")
end
end
describe "when string requires interpolation arguments" do

4
spec/models/user_spec.rb
View file

@ -302,7 +302,7 @@ describe User, :type => :model do
end
it "requires a valid email address" do
alice.email = "somebody@anywhere"
alice.email = "somebodyanywhere"
expect(alice).not_to be_valid
end
@ -334,7 +334,7 @@ describe User, :type => :model do
end
it "requires a valid unconfirmed_email address" do
alice.unconfirmed_email = "somebody@anywhere"
alice.unconfirmed_email = "somebodyanywhere"
expect(alice).not_to be_valid
end
end

5
spec/requests_helper.rb
View file

@ -1,5 +0,0 @@
include Warden::Test::Helpers
def login(user)
login_as user, scope: :user
end

3
spec/spec_helper.rb
View file

@ -93,7 +93,8 @@ support_files.each {|f| require f }
require fixture_builder_file
RSpec.configure do |config|
config.include Devise::TestHelpers, :type => :controller
config.include Devise::Test::ControllerHelpers, type: :controller
config.include Devise::Test::IntegrationHelpers, type: :request
config.mock_with :rspec
config.example_status_persistence_file_path = "tmp/rspec-persistance.txt"