Merge branch 'feature/unauthorized_admin_login'
This commit is contained in:
commit
ff901ca3d3
@ -9,10 +9,10 @@ module Admin
|
|||||||
|
|
||||||
before_filter :require_site
|
before_filter :require_site
|
||||||
|
|
||||||
load_and_authorize_resource
|
|
||||||
|
|
||||||
before_filter :validate_site_membership
|
before_filter :validate_site_membership
|
||||||
|
|
||||||
|
load_and_authorize_resource
|
||||||
|
|
||||||
before_filter :set_locale
|
before_filter :set_locale
|
||||||
|
|
||||||
helper_method :sections, :current_site_url, :site_url, :page_url, :current_ability
|
helper_method :sections, :current_site_url, :site_url, :page_url, :current_ability
|
||||||
|
@ -6,16 +6,28 @@ Feature: Login
|
|||||||
Background:
|
Background:
|
||||||
Given I have the site: "test site" set up
|
Given I have the site: "test site" set up
|
||||||
|
|
||||||
Scenario: Successful authentication
|
Scenario: Successfully logging in
|
||||||
When I go to login
|
When I go to login
|
||||||
And I fill in "Email" with "admin@locomotiveapp.org"
|
And I fill in "Email" with "admin@locomotiveapp.org"
|
||||||
And I fill in "Password" with "easyone"
|
And I fill in "Password" with "easyone"
|
||||||
And I press "Log in"
|
And I press "Log in"
|
||||||
Then I should see "Listing pages"
|
Then I should see "Listing pages"
|
||||||
|
|
||||||
Scenario: Failed authentication
|
Scenario: Attempting to login with an invalid emai or password
|
||||||
When I go to login
|
When I go to login
|
||||||
And I fill in "Email" with "admin@locomotiveapp.org"
|
And I fill in "Email" with "admin@locomotiveapp.org"
|
||||||
And I fill in "Password" with ""
|
And I fill in "Password" with ""
|
||||||
And I press "Log in"
|
And I press "Log in"
|
||||||
Then I should not see "Listing pages"
|
Then I should not see "Listing pages"
|
||||||
|
And I should see "Invalid email or password"
|
||||||
|
|
||||||
|
Scenario: Attempting to login with an account without a membership
|
||||||
|
Given the following accounts exist:
|
||||||
|
| email | password | password_confirmation |
|
||||||
|
| john@locomotiveapp.org | bluecheese | bluecheese |
|
||||||
|
When I go to login
|
||||||
|
And I fill in "Email" with "john@locomotiveapp.org"
|
||||||
|
And I fill in "Password" with "bluecheese"
|
||||||
|
And I press "Log in"
|
||||||
|
Then I should not see "Listing pages"
|
||||||
|
And I should see "not a member of this site"
|
||||||
|
Loading…
Reference in New Issue
Block a user