Skip to content

Commit d4f95bd

Browse files
authored
Merge pull request #257 from coopdevs/fix/remove-devise-session-flash-messages
Remove devise session flash messages
2 parents cea7a79 + c506dd6 commit d4f95bd

File tree

8 files changed

+55
-9
lines changed

8 files changed

+55
-9
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
class SessionsController < Devise::SessionsController
2+
3+
# POST /resource/sign_in
4+
def create
5+
super
6+
flash.delete(:notice)
7+
end
8+
9+
# DELETE /resource/sign_out
10+
def destroy
11+
super
12+
flash.delete(:notice)
13+
end
14+
end

config/locales/ca.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ ca:
242242
new:
243243
remember_me: Recorda'm
244244
sign_in: Entrar
245-
signed_in:
246-
signed_out:
247245
shared:
248246
links:
249247
didnt_receive_confirmation_instructions: Tornar a enviar correu de confirmació

config/locales/en.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ en:
242242
new:
243243
remember_me: Remember me
244244
sign_in: Login
245-
signed_in:
246-
signed_out:
247245
shared:
248246
links:
249247
didnt_receive_confirmation_instructions: Resend confirmation email

config/locales/es.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,6 @@ es:
245245
new:
246246
remember_me: Recordarme
247247
sign_in: Entrar
248-
signed_in:
249-
signed_out:
250248
user:
251249
signed_in:
252250
shared:

config/locales/pt-BR.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,6 @@ pt-BR:
245245
new:
246246
remember_me: Lembrar de mim
247247
sign_in: Entrar
248-
signed_in:
249-
signed_out:
250248
user:
251249
signed_in:
252250
shared:

config/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Rails.application.routes.draw do
22
root to: "home#index"
33

4-
devise_for :users
4+
devise_for :users, controllers: { sessions: "sessions" }
55

66
devise_scope :user do
77
get "login", to: "devise/sessions#new"
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
require 'spec_helper'
2+
3+
describe SessionsController do
4+
let(:user) do
5+
Fabricate(:user, password: 'papapa22', password_confirmation: 'papapa22')
6+
end
7+
8+
describe '#create' do
9+
before do
10+
request.env["devise.mapping"] = Devise.mappings[:user]
11+
end
12+
13+
it 'does not show a notice flash message' do
14+
post :create, user: {
15+
email: user.email,
16+
password: user.password
17+
}
18+
expect(flash[:notice]).to be_nil
19+
end
20+
end
21+
22+
describe '#destroy' do
23+
before do
24+
request.env["devise.mapping"] = Devise.mappings[:user]
25+
post :create, user: {
26+
email: user.email,
27+
password: user.password
28+
}
29+
end
30+
31+
it 'does not show a notice flash message' do
32+
delete :destroy
33+
expect(flash[:notice]).to be_nil
34+
end
35+
end
36+
end

spec/spec_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
require 'rspec/rails'
77
require 'rspec/autorun'
88
require 'capybara/rails'
9+
require 'database_cleaner'
10+
require 'fabrication'
11+
require 'faker'
12+
I18n.reload!
913

1014
# Requires supporting ruby files with custom matchers and macros, etc,
1115
# in spec/support/ and its subdirectories.

0 commit comments

Comments
 (0)