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

fixed cucumber, localization, and css

Browse source
This commit is contained in:
zhitomirskiyi 2011-02-08 17:14:37 -08:00
parent 4e96d11cd0
commit eecf1d5d82
6 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/getting_started/_step_2.html.haml
View file

@ -9,7 +9,7 @@
%br %br
%br %br
%h3{:style => 'text-align: center;'} %h3{:style => 'text-align: center;'}
= t('.find_your_friends_on_facebook') = t('.find_your_friends_on_diaspora')
%br %br
%br %br
%br %br

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

@ -239,7 +239,7 @@ en:
finish: "Finish" finish: "Finish"
people_already_on_diaspora: "People already on Diaspora" people_already_on_diaspora: "People already on Diaspora"
step_2: step_2:
find_your_friends_on_facebook: "would you like to find your friends on facebook?" find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
skip: "Skip" skip: "Skip"
update: update:
password_changed: "Password Changed" password_changed: "Password Changed"

4
features/accepts_invitation.feature
View file

@ -15,7 +15,7 @@ Feature: invitation acceptance
And I fill in "profile_gender" with "guess!" And I fill in "profile_gender" with "guess!"
And I press "Save and continue" And I press "Save and continue"
Then I should see "Profile updated" Then I should see "Profile updated"
And I should see "would you like to find your friends on facebook?" 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:" And I should not see "Here are the people who are waiting for you:"
Scenario: accept invitation from user Scenario: accept invitation from user
@ -34,7 +34,7 @@ Feature: invitation acceptance
And I press "Save and continue" And I press "Save and continue"
Then I should see "Profile updated" Then I should see "Profile updated"
And I should see "would you like to find your friends on facebook?" And I should see "Would you like to find your Facebook friends on Diaspora?"
When I follow "Skip" When I follow "Skip"
Then I should see "People already on Diaspora" Then I should see "People already on Diaspora"

1
features/connects_users.feature
View file

@ -37,7 +37,6 @@ Feature: sending and receiving requests
And I fill in "Name" with "Super People" in the modal window And I fill in "Name" with "Super People" in the modal window
And I press "aspect_submit" in the modal window And I press "aspect_submit" in the modal window
And I wait for the ajax to finish And I wait for the ajax to finish
And I press the first ".add.button" within "#facebox #aspects_list ul > li:last-child"
When I go to the home page When I go to the home page
Then I go to the aspects manage page Then I go to the aspects manage page

24
features/signs_up.feature
View file

@ -9,32 +9,20 @@ Feature: new user registration
And I fill in "Password confirmation" with "secret" And I fill in "Password confirmation" with "secret"
And I press "Sign up" And I press "Sign up"
Then I should be on the getting started page Then I should be on the getting started page
And I should see "Welcome to Diaspora!" And I should see "getting_started_logo"
Scenario: new user goes through the setup wizard Scenario: new user goes through the setup wizard
Then I should see "Your services" When I fill in "profile_first_name" with "O"
When I follow "Save and continue"
And I wait for "step 2" to load
When I fill in "profile_first_name" with "O"
And I fill in "profile_last_name" with "Hai" And I fill in "profile_last_name" with "Hai"
And I fill in "profile_gender" with "guess!" And I fill in "profile_gender" with "guess!"
And I press "Save and continue" And I press "Save and continue"
And I wait for "step 3" to load And I wait for "step 2" to load
Then I should see "Profile updated" Then I should see "Profile updated"
And I should see "Your aspects" And I should see "Would you like to find your Facebook friends on Diaspora?"
And I follow "Skip"
When I fill in "step-3-aspect-name" with "cheez friends"
And I press "Add"
Then I should see "cheez friends"
When I follow "Save and continue"
And I wait for "step 4" to load
Then I should see "You're all set up, O!"
But I should not see "skip getting started"
When I follow "Continue on to your Home page, an overview of all of your aspects."
Then I should be on the aspects page Then I should be on the aspects page
And I should not see "skip getting started"
And I should see "Bring the people that matter in your life to Diaspora!" And I should see "Bring the people that matter in your life to Diaspora!"
Scenario: new user skips the setup wizard and returns to the setup wizard Scenario: new user skips the setup wizard and returns to the setup wizard

1
public/stylesheets/sass/application.sass
View file

@ -2424,6 +2424,7 @@ ul.show_comments
:right 1em :right 1em
.done .done
:padding 1em :padding 1em
:bottom 2em
.right .right
:right 1em :right 1em