use username field if configured

Marvin Frederickson
1 parent 483cc5f9
Showing 2 changed files with 21 additions and 4 deletions Show diff stats
spec/acceptance/acceptance_helper.rb
spec/controllers/devise_sessions_controller_spec.rb
@@ -22,7 +22,13 @@ end
  
 def log_in(user)
   visit '/'
-  fill_in :user_email, with: user.email
+
+  if Errbit::Config.user_has_username
+    fill_in :user_username, with: user.username
+  else
+    fill_in :user_email, with: user.email
+  end
+
   fill_in :user_password, with: 'password'
   click_on I18n.t('devise.sessions.new.sign_in')
 end
@@ -10,13 +10,24 @@ describe Devise::SessionsController, type: &#39;controller&#39; do
     let(:user) { Fabricate(:user) }
  
     it 'redirects to app index page if there are no apps for the user' do
-      post :create, user: { 'email' => user.email, 'password' => user.password }
+      details = { 'email' => user.email, 'password' => user.password }
+      if Errbit::Config.user_has_username
+        details['username'] = user.username 
+      end
+
+      post :create, user: details
       expect(response).to redirect_to(root_path)
     end
  
     it 'displays a friendly error when credentials are invalid' do
-      post :create, user: { 'email' => 'whatever', 'password' => 'somethinginvalid' }
-      expect(request.flash["alert"]).to eq(I18n.t 'devise.failure.user.email_invalid')
+      details = { 'email' => 'whatever', 'password' => 'somethinginvalid' }
+      msg = I18n.t('devise.failure.user.email_invalid')
+      if Errbit::Config.user_has_username
+        details['username'] = 'somethinginvalid'
+        msg = I18n.t('devise.failure.user.username_invalid')
+      end
+      post :create, user: details
+      expect(request.flash["alert"]).to eq(msg)
     end
   end
 end
...	...	@@ -22,7 +22,13 @@ end
22	22
23	23	def log_in(user)
24	24	visit '/'
25		- fill_in :user_email, with: user.email
	25	+
	26	+ if Errbit::Config.user_has_username
	27	+ fill_in :user_username, with: user.username
	28	+ else
	29	+ fill_in :user_email, with: user.email
	30	+ end
	31	+
26	32	fill_in :user_password, with: 'password'
27	33	click_on I18n.t('devise.sessions.new.sign_in')
28	34	end
...	...
...	...	@@ -10,13 +10,24 @@ describe Devise::SessionsController, type: 'controller' do
10	10	let(:user) { Fabricate(:user) }
11	11
12	12	it 'redirects to app index page if there are no apps for the user' do
13		- post :create, user: { 'email' => user.email, 'password' => user.password }
	13	+ details = { 'email' => user.email, 'password' => user.password }
	14	+ if Errbit::Config.user_has_username
	15	+ details['username'] = user.username
	16	+ end
	17	+
	18	+ post :create, user: details
14	19	expect(response).to redirect_to(root_path)
15	20	end
16	21
17	22	it 'displays a friendly error when credentials are invalid' do
18		- post :create, user: { 'email' => 'whatever', 'password' => 'somethinginvalid' }
19		- expect(request.flash["alert"]).to eq(I18n.t 'devise.failure.user.email_invalid')
	23	+ details = { 'email' => 'whatever', 'password' => 'somethinginvalid' }
	24	+ msg = I18n.t('devise.failure.user.email_invalid')
	25	+ if Errbit::Config.user_has_username
	26	+ details['username'] = 'somethinginvalid'
	27	+ msg = I18n.t('devise.failure.user.username_invalid')
	28	+ end
	29	+ post :create, user: details
	30	+ expect(request.flash["alert"]).to eq(msg)
20	31	end
21	32	end
22	33	end
...	...