Download as
Browse Code »

Commit 0f6c78efb4809687fc891b6bedc31a4514dfe324

Authored by Antonio Terceiro
1 parent 6fc45cfb
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1240: adding signup test 

Also, don't display login stuff in the signup page.
Showing 2 changed files with 28 additions and 13 deletions   Show diff stats
app/views/shared/user_menu.rhtml
  Diff comments   View file @0f6c78e
... ... @@ -58,19 +58,17 @@
58 58  
59 59 <% else %>
60 60  
61   - <% if theme_option( :menu_login ) == 'full_form' %>
62   -
63   - <%= render :file => 'account/login_block' %>
64   -
65   - <% else # theme_option( :menu_login ) != 'full_form' %>
66   -
67   - <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
68   - <div id='inlineLoginBox' style='display: none;'>
69   - <%= render :file => 'account/login' %>
70   - <center><%= thickbox_close_button _('Close') %></center>
71   - </div>
72   -
73   - <% end # theme_option( :menu_login ) != 'full_form' %>
  61 + <% if params[:controller] != 'account' || params[:action] != 'signup' %>
  62 + <% if theme_option( :menu_login ) == 'full_form' %>
  63 + <%= render :file => 'account/login_block' %>
  64 + <% else %>
  65 + <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
  66 + <div id='inlineLoginBox' style='display: none;'>
  67 + <%= render :file => 'account/login' %>
  68 + <center><%= thickbox_close_button _('Close') %></center>
  69 + </div>
  70 + <% end %>
  71 + <% end %>
74 72  
75 73 <% end %>
76 74  
... ...
features/signup.feature 0 → 100644
  Diff comments   View file @0f6c78e
... ... @@ -0,0 +1,17 @@
  1 +Feature: signup
  2 + As a new user
  3 + I want to sign up to the site
  4 + So I can have fun using its features
  5 +
  6 + Scenario: successfull registration
  7 + Given I am on the homepage
  8 + When I follow "Login"
  9 + And I follow "I want to participate"
  10 + And I fill in "e-Mail" with "ze@example.com"
  11 + And I fill in "Username" with "ze"
  12 + And I fill in "Password" with "secret"
  13 + And I fill in "Password confirmation" with "secret"
  14 + And I fill in "Full name" with "José da Silva"
  15 + And I press "Sign up"
  16 + Then I should see "Thanks for signing up!"
  17 +
... ...