DG MS; fixed cucumber tests to work with new landing page flow
This commit is contained in:
parent
056dc7d3ba
commit
1a9041a3c0
5 changed files with 423 additions and 422 deletions
|
|
@ -20,7 +20,8 @@
|
||||||
|
|
||||||
- if current_user.owns?(post)
|
- if current_user.owns?(post)
|
||||||
.right
|
.right
|
||||||
= link_to t('delete'), photo_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
|
= render 'shared/reshare', :post => post if post.is_a? StatusMessage
|
||||||
|
= link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
|
||||||
|
|
||||||
= render type_partial(post), :post => post
|
= render type_partial(post), :post => post
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,11 @@ Feature: user authentication
|
||||||
And I fill in "Username" with "ohai"
|
And I fill in "Username" with "ohai"
|
||||||
And I fill in "Password" with "secret"
|
And I fill in "Password" with "secret"
|
||||||
And I press "Sign in"
|
And I press "Sign in"
|
||||||
Then I should be on the home page
|
Then I should be on the aspects page
|
||||||
|
|
||||||
@javascript
|
@javascript
|
||||||
Scenario: user logs out
|
Scenario: user logs out
|
||||||
Given I am signed in
|
Given I am signed in
|
||||||
And I click on my name in the header
|
And I click on my name in the header
|
||||||
And I follow "logout"
|
And I follow "logout"
|
||||||
Then I should be on the new user session page
|
Then I should be on the home page
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,11 @@ Feature: new user registration
|
||||||
Then I should see "You're all set up, O!"
|
Then I should see "You're all set up, O!"
|
||||||
|
|
||||||
When I follow "Continue on to your everyone page, an overview of all of your aspects."
|
When I follow "Continue on to your everyone page, an overview of all of your aspects."
|
||||||
Then I should be on the home page
|
Then I should be on the aspects page
|
||||||
And I should see "bring them to Diaspora!"
|
And I should see "bring them to Diaspora!"
|
||||||
|
|
||||||
Scenario: new user skips the setup wizard
|
Scenario: new user skips the setup wizard
|
||||||
When I follow "skip getting started"
|
When I follow "skip getting started"
|
||||||
And I wait for the home page to load
|
And I wait for the aspects page to load
|
||||||
Then I should be on the home page
|
Then I should be on the aspects page
|
||||||
And I should see "bring them to Diaspora!"
|
And I should see "bring them to Diaspora!"
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ Then /^I should see "([^\"]*)" in the main content area$/ do |stuff|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
When /^I wait for the home page to load$/ do
|
When /^I wait for the aspects page to load$/ do
|
||||||
wait_until { current_path == root_path }
|
wait_until { current_path == aspects_path }
|
||||||
end
|
end
|
||||||
|
|
||||||
When /^I wait for the ajax to finish$/ do
|
When /^I wait for the ajax to finish$/ do
|
||||||
|
|
|
||||||
826
spec/fixtures/users.yaml
vendored
826
spec/fixtures/users.yaml
vendored
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue