green build = happy dan

features/accepts_invitation.feature

@@ -7,8 +7,7 @@ Feature: invitation acceptance
         | user_username              | ohai           |
         | user_email                 | woot@sweet.com |
         | user_password              | secret         |
-        | user_password_confirmation | secret         |
+      And I press "Continue"
-      And I press "Create my account"
       Then I should be on the getting started page
       And I should see "Well, hello there!"
       And I fill in the following:
@@ -25,8 +24,7 @@ Feature: invitation acceptance
         | user_username              | ohai           |
         | user_email                 | woot@sweet.com |
         | user_password              | secret         |
-        | user_password_confirmation | secret         |
+      And I press "Continue"
-      And I press "Create my account"
       Then I should be on the getting started page
       And I should see "Well, hello there!"
       And I fill in the following:

features/change_password.feature

@@ -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

features/signs_up.feature

@@ -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 "Continue"
-    And I press "Create my account!"
     Then I should be on the getting started page
     And I should see "Well, hello there!"
     And I should see "Who are you?"

spec/helpers/layout_helper_spec.rb

@@ -17,14 +17,8 @@ describe LayoutHelper do
     end
 
     context "passed blank text" do
-      it "returns current_user.name if logged in" do
+      it "returns Diaspora*" do
-        @current_user = @user
+        page_title.should == "Diaspora*"
-        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")
       end
     end
 

spec/models/profile_spec.rb

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

spec/presenters/post_presenter_spec.rb

@@ -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)}/next"
-      @presenter.next_post_path.should ==  Rails.application.routes.url_helpers.post_path(@sm)
     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)}/previous"
-      @presenter.previous_post_path.should ==  Rails.application.routes.url_helpers.post_path(@sm)
     end
   end