Commit 1a9041a3 authored by danielvincent's avatar danielvincent

DG MS; fixed cucumber tests to work with new landing page flow

parent 056dc7d3
......@@ -20,7 +20,8 @@
- if current_user.owns?(post)
.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
......
......@@ -6,11 +6,11 @@ Feature: user authentication
And I fill in "Username" with "ohai"
And I fill in "Password" with "secret"
And I press "Sign in"
Then I should be on the home page
Then I should be on the aspects page
@javascript
Scenario: user logs out
Given I am signed in
And I click on my name in the header
And I follow "logout"
Then I should be on the new user session page
\ No newline at end of file
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!"
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!"
Scenario: new user skips the setup wizard
When I follow "skip getting started"
And I wait for the home page to load
Then I should be on the home page
And I wait for the aspects page to load
Then I should be on the aspects page
And I should see "bring them to Diaspora!"
......@@ -22,11 +22,11 @@ Then /^I should see "([^\"]*)" in the main content area$/ do |stuff|
end
end
When /^I wait for the home page to load$/ do
wait_until { current_path == root_path }
When /^I wait for the aspects page to load$/ do
wait_until { current_path == aspects_path }
end
When /^I wait for the ajax to finish$/ do
pending
# wait_until { ??? }
end
\ No newline at end of file
end
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment