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

fix cucumber; temporarily remove fetch featured users initilizer

Browse source
This commit is contained in:
danielgrippi 2011-08-03 15:08:27 -07:00
parent 984eef25be
commit e23439d193
7 changed files with 51 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/profiles_controller.rb
View file

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

3
app/views/layouts/_header.html.haml
View file

@ -73,13 +73,14 @@
#lightbox-backdrop
= current_user.diaspora_handle
%ul#user_menu.dropdown
%li
.right
&#9660;
.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?

4
app/views/users/getting_started.html.haml
View file

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

16
config/initializers/fetch_featured_users.rb
View file

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

2
config/locales/diaspora/en.yml
View file

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

31
features/accepts_invitation.feature
View file

@ -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"
And I should see "Would you like to find your Facebook friends on Diaspora?"
And I should not see "Here are the people who are waiting for you:"
| profile_bio | swagger |
| profile_location | new york, ny |
| 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 |
And I press "Save and continue"
And I should see "Would you like to find your Facebook friends on Diaspora?"
When I follow "Skip"
| profile_first_name | O |
| profile_last_name | Hai |
| tags | #beingawesome |
| profile_bio | swagger |
| profile_location | new york, ny |
| 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

22
features/signs_up.feature
View file

@ -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 follow "Skip"
And I should see "Welcome"
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