Fix tests and add message if no oauth apps
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
592e396869
commit
aadfb3665f
|
@ -26,7 +26,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
|
||||||
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy])
|
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy])
|
||||||
end
|
end
|
||||||
|
|
||||||
redirect_to profile_account_url
|
redirect_to applications_profile_url
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -26,18 +26,22 @@
|
||||||
|
|
||||||
%fieldset.oauth-authorized-applications.prepend-top-20
|
%fieldset.oauth-authorized-applications.prepend-top-20
|
||||||
%legend Authorized applications
|
%legend Authorized applications
|
||||||
%table.table.table-striped
|
|
||||||
%thead
|
- if @authorized_tokens.any?
|
||||||
%tr
|
%table.table.table-striped
|
||||||
%th Name
|
%thead
|
||||||
%th Authorized At
|
%tr
|
||||||
%th Scope
|
%th Name
|
||||||
%th
|
%th Authorized At
|
||||||
%tbody
|
%th Scope
|
||||||
- @authorized_tokens.each do |token|
|
%th
|
||||||
- application = token.application
|
%tbody
|
||||||
%tr{:id => "application_#{application.id}"}
|
- @authorized_tokens.each do |token|
|
||||||
%td= application.name
|
- application = token.application
|
||||||
%td= token.created_at
|
%tr{:id => "application_#{application.id}"}
|
||||||
%td= token.scopes
|
%td= application.name
|
||||||
%td= render 'doorkeeper/authorized_applications/delete_form', application: application
|
%td= token.created_at
|
||||||
|
%td= token.scopes
|
||||||
|
%td= render 'doorkeeper/authorized_applications/delete_form', application: application
|
||||||
|
- else
|
||||||
|
%p.light You dont have any authorized applications
|
||||||
|
|
|
@ -72,7 +72,7 @@ Feature: Profile
|
||||||
Then I should see my user page
|
Then I should see my user page
|
||||||
|
|
||||||
Scenario: I can manage application
|
Scenario: I can manage application
|
||||||
Given I visit profile account page
|
Given I visit profile applications page
|
||||||
Then I click on new application button
|
Then I click on new application button
|
||||||
And I should see application form
|
And I should see application form
|
||||||
Then I fill application form out and submit
|
Then I fill application form out and submit
|
||||||
|
@ -81,7 +81,7 @@ Feature: Profile
|
||||||
And I see edit application form
|
And I see edit application form
|
||||||
Then I change name of application and submit
|
Then I change name of application and submit
|
||||||
And I see that application was changed
|
And I see that application was changed
|
||||||
Then I visit profile account page
|
Then I visit profile applications page
|
||||||
And I click to remove application
|
And I click to remove application
|
||||||
Then I see that application is removed
|
Then I see that application is removed
|
||||||
|
|
||||||
|
@ -115,4 +115,4 @@ Feature: Profile
|
||||||
Scenario: I see the password strength indicator with success
|
Scenario: I see the password strength indicator with success
|
||||||
Given I visit profile password page
|
Given I visit profile password page
|
||||||
When I try to set a strong password
|
When I try to set a strong password
|
||||||
Then I should see the input field green
|
Then I should see the input field green
|
||||||
|
|
|
@ -94,6 +94,10 @@ module SharedPaths
|
||||||
visit profile_path
|
visit profile_path
|
||||||
end
|
end
|
||||||
|
|
||||||
|
step 'I visit profile applications page' do
|
||||||
|
visit applications_profile_path
|
||||||
|
end
|
||||||
|
|
||||||
step 'I visit profile password page' do
|
step 'I visit profile password page' do
|
||||||
visit edit_profile_password_path
|
visit edit_profile_password_path
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue