Making the remaining acceptance tests pass with the new default layout

Antonio Terceiro
1 parent 089ad9e1
Showing 5 changed files with 21 additions and 22 deletions Show diff stats
app/views/layouts/application-ng.rhtml
features/join_community.feature
features/search.feature
features/signup.feature
features/support/paths.rb
@@ -67,10 +67,12 @@
             <% end %>
             <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
           <% else %>
-            <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
-            <div id='inlineLoginBox' style='display: none;'>
-              <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-            </div>
+            <% if params[:controller] != 'account' || params[:action] != 'signup' %>
+              <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
+              <div id='inlineLoginBox' style='display: none;'>
+                <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+              </div>
+            <% end %>
           <% end %>
  
           <form action="/search" class="search_form" method="get" class="clean">
@@ -47,7 +47,7 @@ Feature: join a community
     And I am not logged in
     And I go to Sample Community's homepage
     And I press "Yes"
-    And I follow "I want to participate"
+    And I follow "New user"
     And I fill in the following:
       | e-mail | jose@domain.br |
       | Username | joseoliveira |
@@ -4,36 +4,33 @@ Feature: search
   In order to find stuff
  
   Scenario: simple search for person
-    Given I am on the homepage
-    And the following users
+    Given the following users
       | login | name |
       | joaosilva | Joao Silva |
       | josearaujo | Jose Araujo |
-    When I follow "Search"
+    When I go to the search page
     And I fill in "query" with "Silva"
     And I press "Search"
     Then I should see "Joao Silva"
     And I should not see "Jose Araujo"
  
   Scenario: simple search for community
-    Given I am on the homepage
-    And the following communities
+    Given the following communities
       | identifier | name |
       | boring-community | Boring community |
       | fancy-community | Fancy community |
-    And I follow "Search"
+    And I go to the search page
     And I fill in "query" with "fancy"
     And I press "Search"
     Then I should see "Fancy community"
     And I should not see "Boring community"
  
   Scenario: simple search for enterprise
-    Given I am on the homepage
-    And the following enterprises
+    Given the following enterprises
       | identifier | name |
       | products-factory | Products factory |
       | services-provider | Services Provider |
-    And I follow "Search"
+    And I go to the search page
     And I fill in "query" with "services"
     And I press "Search"
     Then I should see "Services Provider"
@@ -47,8 +44,7 @@ Feature: search
       | owner     | name                 | body |
       | joaosilva | bees and butterflies | this is an article about bees and butterflies |
       | joaosilva | whales and dolphins | this is an article about whales and dolphins |
-    And I am on the homepage
-    When I follow "Search"
+    When I go to the search page
     And I fill in "query" with "whales"
     And I press "Search"
     Then I should see "whales and dolphins"
@@ -63,8 +59,7 @@ Feature: search
       | owner | name |
       | colivre-ent | social networks consultancy |
       | colivre-ent | wikis consultancy |
-    And I am on the homepage
-    When I follow "Search"
+    When I go to the search page
     And I fill in "query" with "wikis"
     And I press "Search"
     Then I should see "wikis consultancy"
@@ -79,8 +74,7 @@ Feature: search
       | owner | name | start_date |
       | nice-people | Group meeting | 2009-10-01 |
       | nice-people | John Doe's birthday | 2009-09-01 |
-    And I am on the homepage
-    When I follow "Search"
+    When I go to the search page
     And I fill in "query" with "birthday"
     And I press "Search"
     Then I should see "John Doe's birthday"
@@ -6,7 +6,7 @@ Feature: signup
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
-    And I follow "I want to participate"
+    And I follow "New user"
     And I fill in "e-Mail" with "josesilva@example.com"
     And I fill in "Username" with "josesilva"
     And I fill in "Password" with "secret"
@@ -26,7 +26,7 @@ Feature: signup
   Scenario: user cannot register without a name
     Given I am on the homepage
     And I follow "Login"
-    And I follow "I want to participate"
+    And I follow "New user"
     And I fill in "e-Mail" with "josesilva@example.com"
     And I fill in "Username" with "josesilva"
     And I fill in "Password" with "secret"
@@ -38,6 +38,9 @@ module NavigationHelpers
     when /^(.*)'s control panel$/
       '/myprofile/%s' % Profile.find_by_name($1).identifier
  
+    when /^the search page$/
+      '/search'
+
     # Add more mappings here.
     # Here is a more fancy example:
     #
...	...	@@ -67,10 +67,12 @@
67	67	<% end %>
68	68	<%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
69	69	<% else %>
70		- <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
71		- <div id='inlineLoginBox' style='display: none;'>
72		- <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
73		- </div>
	70	+ <% if params[:controller] != 'account' \|\| params[:action] != 'signup' %>
	71	+ <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
	72	+ <div id='inlineLoginBox' style='display: none;'>
	73	+ <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
	74	+ </div>
	75	+ <% end %>
74	76	<% end %>
75	77
76	78	<form action="/search" class="search_form" method="get" class="clean">
...	...
...	...	@@ -47,7 +47,7 @@ Feature: join a community
47	47	And I am not logged in
48	48	And I go to Sample Community's homepage
49	49	And I press "Yes"
50		- And I follow "I want to participate"
	50	+ And I follow "New user"
51	51	And I fill in the following:
52	52	\| e-mail \| jose@domain.br \|
53	53	\| Username \| joseoliveira \|
...	...
...	...	@@ -4,36 +4,33 @@ Feature: search
4	4	In order to find stuff
5	5
6	6	Scenario: simple search for person
7		- Given I am on the homepage
8		- And the following users
	7	+ Given the following users
9	8	\| login \| name \|
10	9	\| joaosilva \| Joao Silva \|
11	10	\| josearaujo \| Jose Araujo \|
12		- When I follow "Search"
	11	+ When I go to the search page
13	12	And I fill in "query" with "Silva"
14	13	And I press "Search"
15	14	Then I should see "Joao Silva"
16	15	And I should not see "Jose Araujo"
17	16
18	17	Scenario: simple search for community
19		- Given I am on the homepage
20		- And the following communities
	18	+ Given the following communities
21	19	\| identifier \| name \|
22	20	\| boring-community \| Boring community \|
23	21	\| fancy-community \| Fancy community \|
24		- And I follow "Search"
	22	+ And I go to the search page
25	23	And I fill in "query" with "fancy"
26	24	And I press "Search"
27	25	Then I should see "Fancy community"
28	26	And I should not see "Boring community"
29	27
30	28	Scenario: simple search for enterprise
31		- Given I am on the homepage
32		- And the following enterprises
	29	+ Given the following enterprises
33	30	\| identifier \| name \|
34	31	\| products-factory \| Products factory \|
35	32	\| services-provider \| Services Provider \|
36		- And I follow "Search"
	33	+ And I go to the search page
37	34	And I fill in "query" with "services"
38	35	And I press "Search"
39	36	Then I should see "Services Provider"
...	...	@@ -47,8 +44,7 @@ Feature: search
47	44	\| owner \| name \| body \|
48	45	\| joaosilva \| bees and butterflies \| this is an article about bees and butterflies \|
49	46	\| joaosilva \| whales and dolphins \| this is an article about whales and dolphins \|
50		- And I am on the homepage
51		- When I follow "Search"
	47	+ When I go to the search page
52	48	And I fill in "query" with "whales"
53	49	And I press "Search"
54	50	Then I should see "whales and dolphins"
...	...	@@ -63,8 +59,7 @@ Feature: search
63	59	\| owner \| name \|
64	60	\| colivre-ent \| social networks consultancy \|
65	61	\| colivre-ent \| wikis consultancy \|
66		- And I am on the homepage
67		- When I follow "Search"
	62	+ When I go to the search page
68	63	And I fill in "query" with "wikis"
69	64	And I press "Search"
70	65	Then I should see "wikis consultancy"
...	...	@@ -79,8 +74,7 @@ Feature: search
79	74	\| owner \| name \| start_date \|
80	75	\| nice-people \| Group meeting \| 2009-10-01 \|
81	76	\| nice-people \| John Doe's birthday \| 2009-09-01 \|
82		- And I am on the homepage
83		- When I follow "Search"
	77	+ When I go to the search page
84	78	And I fill in "query" with "birthday"
85	79	And I press "Search"
86	80	Then I should see "John Doe's birthday"
...	...
...	...	@@ -6,7 +6,7 @@ Feature: signup
6	6	Scenario: successfull registration
7	7	Given I am on the homepage
8	8	When I follow "Login"
9		- And I follow "I want to participate"
	9	+ And I follow "New user"
10	10	And I fill in "e-Mail" with "josesilva@example.com"
11	11	And I fill in "Username" with "josesilva"
12	12	And I fill in "Password" with "secret"
...	...	@@ -26,7 +26,7 @@ Feature: signup
26	26	Scenario: user cannot register without a name
27	27	Given I am on the homepage
28	28	And I follow "Login"
29		- And I follow "I want to participate"
	29	+ And I follow "New user"
30	30	And I fill in "e-Mail" with "josesilva@example.com"
31	31	And I fill in "Username" with "josesilva"
32	32	And I fill in "Password" with "secret"
...	...
...	...	@@ -38,6 +38,9 @@ module NavigationHelpers
38	38	when /^(.*)'s control panel$/
39	39	'/myprofile/%s' % Profile.find_by_name($1).identifier
40	40
	41	+ when /^the search page$/
	42	+ '/search'
	43	+
41	44	# Add more mappings here.
42	45	# Here is a more fancy example:
43	46	#
...	...