nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

green build = happy dan

Browse source
This commit is contained in:
danielgrippi 2012-05-07 14:30:30 -07:00
parent f3a51615af
commit c31413e73c
6 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
features/accepts_invitation.feature
View file

@ -6,13 +6,12 @@ Feature: invitation acceptance
And I fill in the following:
| user_username | ohai |
| user_email | woot@sweet.com |
| user_password | secret |
| user_password_confirmation | secret |
And I press "Create my account"
| user_password | secret |
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!"
And I fill in the following:
| profile_first_name | O |
| profile_first_name | O |
And I preemptively confirm the alert
And I follow "awesome_button"
@ -24,13 +23,12 @@ Feature: invitation acceptance
And I fill in the following:
| user_username | ohai |
| user_email | woot@sweet.com |
| user_password | secret |
| user_password_confirmation | secret |
And I press "Create my account"
| user_password | secret |
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!"
And I fill in the following:
| profile_first_name | O |
| profile_first_name | O |
And I preemptively confirm the alert
And I follow "awesome_button"

2
features/change_password.feature
View file

@ -24,4 +24,4 @@ Feature: Change password
And I fill in "Password" with "supersecret"
And I fill in "Password confirmation" with "supersecret"
And I press "Change my password"
Then I should see "Your password was changed successfully"
Then I should be on the stream page

3
features/signs_up.feature
View file

@ -6,8 +6,7 @@ Feature: new user registration
And I fill in "user_username" with "ohai"
And I fill in "user_email" with "ohai@example.com"
And I fill in "user_password" with "secret"
And I fill in "user_password_confirmation" with "secret"
And I press "Create my account!"
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!"
And I should see "Who are you?"

10
spec/helpers/layout_helper_spec.rb
View file

@ -17,14 +17,8 @@ describe LayoutHelper do
end
context "passed blank text" do
it "returns current_user.name if logged in" do
@current_user = @user
page_title.should == @user.name
end
it "returns default title if not logged in" do
@current_user = nil
page_title.should == I18n.t("application.helper.diaspora_alpha")
it "returns Diaspora*" do
page_title.should == "Diaspora*"
end
end

3
spec/models/profile_spec.rb
View file

@ -335,7 +335,8 @@ describe Profile do
"searchable",
"nsfw",
"location",
"full_name"].sort
"full_name",
"wallpaper"].sort
end
end
end

6
spec/presenters/post_presenter_spec.rb
View file

@ -56,15 +56,13 @@ describe PostPresenter do
describe '#next_post_path' do
it 'returns a string of the users next post' do
@presenter.should_receive(:next_post).and_return(@sm)
@presenter.next_post_path.should == Rails.application.routes.url_helpers.post_path(@sm)
@presenter.next_post_path.should == "#{Rails.application.routes.url_helpers.post_path(@sm)}/next"
end
end
describe '#previous_post_path' do
it 'returns a string of the users next post' do
@presenter.should_receive(:previous_post).and_return(@sm)
@presenter.previous_post_path.should == Rails.application.routes.url_helpers.post_path(@sm)
@presenter.previous_post_path.should == "#{Rails.application.routes.url_helpers.post_path(@sm)}/previous"
end
end