fix cucumber; temporarily remove fetch featured users initilizer

app/controllers/profiles_controller.rb

@@ -36,7 +36,7 @@ class ProfilesController < ApplicationController
 
     if current_user.update_profile params[:profile]
       flash[:notice] = I18n.t 'profiles.update.updated'
-      if params[:getting_started]
+      if current_user.getting_started?
         redirect_to getting_started_path(:step => params[:getting_started].to_i+1)
       else
         redirect_to edit_profile_path

app/views/layouts/_header.html.haml

@@ -73,13 +73,14 @@
       #lightbox-backdrop
         
 
+    = current_user.diaspora_handle
     %ul#user_menu.dropdown
       %li
         .right
           ▼
         .avatar
           = owner_image_tag(:thumb_small)
-        = link_to current_user.name, '#'
+        = link_to current_user.name, '#', :title => current_user.diaspora_handle
       %li= link_to t('.profile'), current_user.person
       %li= link_to t('.settings'), edit_user_path
       -if current_user.admin?

app/views/users/getting_started.html.haml

@@ -158,6 +158,10 @@
             = image_tag '/images/cubbies_collage.png', :width => 422, :height => 159, :class => "cubbies_collage_small"
             = image_tag '/images/cubbies_screenshot2.png', :height => 151, :width => 200, :class => "cubbies_user_page_small"
 
+      %li{:style => 'text-align:center;'}
+        %p
+          = link_to t('.skip'), getting_started_completed_path
+
 /.span-5.rightBar.last
 /  = render 'selected_contacts', :people => @selected_people.sample(20), :count => @contact_count
 /  = render 'shared/right_sections'

config/initializers/fetch_featured_users.rb

@@ -1,7 +1,9 @@
-unless Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count
+#this breaks seed scripts
-  puts "Fetching featured users from remote servers..."
+#
-  AppConfig[:featured_users].each do |x|
+#unless Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count
-    Webfinger.new(x).fetch
+#  puts "Fetching featured users from remote servers..."
-  end
+#  AppConfig[:featured_users].each do |x|
-  puts "Done fetching!"
+#    Webfinger.new(x).fetch
-end
+#  end
+#  puts "Done fetching!"
+#end

config/locales/diaspora/en.yml

@@ -780,7 +780,7 @@ en:
       welcome: "Welcome!"
       welcome_with_name: "Welcome, %{name}!"
 
-      skip: "skip getting started"
+      skip: "Skip getting started"
 
       fill_out_your_profile: "Fill out your profile"
       profile_description: "Description of why you'd want to do this"

features/accepts_invitation.feature

@@ -10,14 +10,19 @@ Feature: invitation acceptance
         | Password confirmation | secret         |
       And I press "Sign up"
       Then I should be on the getting started page
-      And I should see "getting_started_logo"
+      And I should see "Welcome"
+      Then I follow "Edit Profile"
       And I fill in the following:
         | profile_first_name | O             |
         | profile_last_name  | Hai           |
         | tags               | #beingawesome |
-      And I press "Save and continue"
+        | profile_bio        | swagger       |
-			And I should see "Would you like to find your Facebook friends on Diaspora?"
+        | profile_location   | new york, ny  |
-      And I should not see "Here are the people who are waiting for you:"
+        | profile_gender     | diasporian    |
+      And I press "Update Profile"
+			And I should see "Welcome"
+		  When I follow "Skip getting started"
+		  Then I should be on the aspects page
 
     Scenario: accept invitation from user
       Given I have been invited by a user
@@ -29,13 +34,17 @@ Feature: invitation acceptance
         | Password confirmation | secret         |
       And I press "Sign up"
       Then I should be on the getting started page
-      And I should see "getting_started_logo"
+      And I should see "Welcome"
+      Then I follow "Edit Profile"
       And I fill in the following:
         | profile_first_name | O             |
         | profile_last_name  | Hai           |
-        | tags               | #tags |
+        | tags               | #beingawesome |
-      And I press "Save and continue"
+        | profile_bio        | swagger       |
-			And I should see "Would you like to find your Facebook friends on Diaspora?"
+        | profile_location   | new york, ny  |
-		  When I follow "Skip"
+        | profile_gender     | diasporian    |
+      And I press "Update Profile"
+			And I should see "Welcome"
+		  When I follow "Skip getting started"
 		  Then I should be on the aspects page
 

features/signs_up.feature

@@ -9,26 +9,32 @@ Feature: new user registration
     And I fill in "Password confirmation" with "secret"
     And I press "Sign up"
     Then I should be on the getting started page
-    And I should see "getting_started_logo"
+    And I should see "Welcome"
+    And I should see "Fill out your profile"
+    And I should see "Connect to your other social networks"
+    And I should see "Connect with cool people"
+    And I should see "Follow your interests"
+    And I should see "Connect to Cubbi.es"
 
   Scenario: new user goes through the setup wizard
-   When I fill in "profile_first_name" with "O"
+   When I follow "Edit Profile"
+    And I fill in "profile_first_name" with "O"
     And I fill in "profile_last_name" with "Hai"
     And I fill in "tags" with "#tags"
-    And I press "Save and continue"
+    And I press "Update Profile"
     And I wait for the ajax to finish
     Then I should see "Profile updated"
-    And I should see "Would you like to find your Facebook friends on Diaspora?"
+    And I should see "Welcome"
-    And I follow "Skip"
+    And I follow "Skip getting started"
 
     Then I should be on the aspects page
-    And I should not see "skip getting started"
+    And I should not see "Skip getting started"
 
   Scenario: new user skips the setup wizard and returns to the setup wizard
-    When I follow "skip getting started"
+    When I follow "Skip getting started"
     And I go to the getting started page
     Then I should not see "skip getting started"
   
   Scenario: new user skips the setup wizard
-    When I follow "skip getting started"
+    When I follow "Skip getting started"
     Then I should be on the aspects page