From c31413e73c28d45c64720fd0e0b5132f7bf98781 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 7 May 2012 14:30:30 -0700
Subject: [PATCH] green build = happy dan

---
 features/accepts_invitation.feature    | 14 ++++++--------
 features/change_password.feature       |  2 +-
 features/signs_up.feature              |  3 +--
 spec/helpers/layout_helper_spec.rb     | 10 ++--------
 spec/models/profile_spec.rb            |  3 ++-
 spec/presenters/post_presenter_spec.rb |  6 ++----
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature
index f10dcc827..720541909 100644
--- a/features/accepts_invitation.feature
+++ b/features/accepts_invitation.feature
@@ -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"
diff --git a/features/change_password.feature b/features/change_password.feature
index 41ff0b55c..524a2cbbe 100644
--- a/features/change_password.feature
+++ b/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
diff --git a/features/signs_up.feature b/features/signs_up.feature
index 64a20ab98..cffe886ec 100644
--- a/features/signs_up.feature
+++ b/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 "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?"
diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
index ac09d5a7c..7c312cb1e 100644
--- a/spec/helpers/layout_helper_spec.rb
+++ b/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
-        @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
 
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index efd46b4eb..be2b311f1 100644
--- a/spec/models/profile_spec.rb
+++ b/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
diff --git a/spec/presenters/post_presenter_spec.rb b/spec/presenters/post_presenter_spec.rb
index 263563770..c84c7104a 100644
--- a/spec/presenters/post_presenter_spec.rb
+++ b/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)
+      @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