Commit 08cac104f31807da55c34146b35e0968ebdc02c9

Authored by Tallys Martins
Committed by Rodrigo Souto
1 parent 2c72cbbf

Fix cucumber broken tests

features/approve_article.feature
... ... @@ -62,7 +62,8 @@ Feature: approve article
62 62 And I press "Spread this"
63 63 And I follow "Delete"
64 64 And I confirm the browser dialog
65   - When I am logged in as "joaosilva"
  65 + And I follow "Logout"
  66 + And I am logged in as "joaosilva"
66 67 And I go to sample-community's control panel
67 68 And I follow "Process requests"
68 69 And I choose "Reject"
... ...
features/balloon.feature
... ... @@ -41,19 +41,19 @@ Feature: balloon
41 41 @selenium
42 42 Scenario: I should not see trigger if not enabled on page
43 43 Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
44   - When I go to /assets/people
  44 + When I go to /search/people
45 45 Then I should not see "Profile links"
46 46  
47 47 @selenium
48 48 Scenario: I should not see trigger by default on page
49 49 Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
50   - When I go to /assets/communities
  50 + When I go to /search/communities
51 51 Then I should not see "Members"
52 52  
53 53 @selenium
54 54 Scenario: I should see balloon when clicked on page trigger
55 55 Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
56   - And I go to /assets/communities
  56 + And I go to /search/communities
57 57 And display ".community-trigger"
58 58 When I follow "Profile links"
59 59 Then I should see "Members"
... ...
features/browse_enterprises.feature
... ... @@ -13,20 +13,20 @@ Scenario: show all enterprises
13 13 Given the following enterprises
14 14 | identifier | name |
15 15 | shop2 | Fruits Shop |
16   - Given I am on /assets/enterprises
  16 + Given I am on /search/enterprises
17 17 Then I should see "Enterprises"
18 18 And I should see "Shoes Shop"
19 19 And I should see "Fruits Shop"
20 20  
21 21 Scenario: show profile links button
22   - Given I am on /assets/enterprises
  22 + Given I am on /search/enterprises
23 23 Then I should see "Profile links" within "a.enterprise-trigger"
24 24 And I should not see "Members"
25 25 And I should not see "Agenda"
26 26  
27 27 @selenium-fixme
28 28 Scenario: show profile links when clicked
29   - Given I am on /assets/enterprises
  29 + Given I am on /search/enterprises
30 30 When I follow "Profile links"
31 31 Then I should see "Products" within "ul.menu-submenu-list"
32 32 And I should see "Members" within "ul.menu-submenu-list"
... ... @@ -34,7 +34,7 @@ Scenario: show profile links when clicked
34 34  
35 35 @selenium-fixme
36 36 Scenario: go to catalog when click on products link
37   - Given I am on /assets/enterprises
  37 + Given I am on /search/enterprises
38 38 When I follow "Profile links"
39 39 And I follow "Products" and wait
40 40 Then I should be exactly on /catalog/shop1
... ...
features/change_appearance.feature
... ... @@ -14,7 +14,7 @@ Feature: Change appearance
14 14 And I should not see an element ".box-4"
15 15 And I go to joaosilva's control panel
16 16 And I follow "Edit Appearance"
17   - And I follow "Left Top and Right"
  17 + And I follow "Top and Side Bars"
18 18 And I go to joaosilva's control panel
19 19 And I follow "Edit sideboxes"
20 20 And I should see an element ".box-4"
... ...
features/events.feature
... ... @@ -17,7 +17,7 @@ Feature: events
17 17 Then I should see "November 2009" within ".current-month"
18 18  
19 19 Scenario: go to next month in global agenda
20   - Given I am on /assets/events?year=2009&month=11
  20 + Given I am on /search/events?year=2009&month=11
21 21 When I follow "December"
22 22 Then I should see "December 2009" within ".current-month"
23 23  
... ... @@ -27,7 +27,7 @@ Feature: events
27 27 Then I should see "September 2009" within ".current-month"
28 28  
29 29 Scenario: go to previous month in global agenda
30   - Given I am on /assets/events?year=2009&month=11
  30 + Given I am on /search/events?year=2009&month=11
31 31 When I follow "October"
32 32 Then I should see "October 2009" within ".current-month"
33 33  
... ... @@ -43,7 +43,7 @@ Feature: events
43 43  
44 44 Scenario: go to specific day in global agenda
45 45 Given I am on the homepage
46   - When I am on /assets/events?year=2009&month=11&day=12
  46 + When I am on /search/events?year=2009&month=11&day=12
47 47 Then I should see "Events for November, 2009"
48 48  
49 49 Scenario: list events for specific day
... ... @@ -88,7 +88,7 @@ Feature: events
88 88 And the following events
89 89 | owner | name | start_date |
90 90 | josemanuel | Manuel Birthday | 2009-10-24 |
91   - When I am on /assets/events?year=2009&month=10&day=24
  91 + When I am on /search/events?year=2009&month=10&day=24
92 92 Then I should see "Another Conference"
93 93 And I should see "Manuel Birthday"
94 94  
... ... @@ -157,7 +157,7 @@ Feature: events
157 157 Then I should not see "New events" link
158 158  
159 159 Scenario: display environment name in global agenda
160   - When I am on /assets/events
  160 + When I am on /search/events
161 161 Then I should see "Colivre.net's Events"
162 162  
163 163 @selenium
... ...
features/profile_domain.feature
... ... @@ -21,9 +21,7 @@ Feature: domain for profile
21 21 Scenario: access profile control panel through profile blocks
22 22 Given I am logged in as "joaosilva"
23 23 When I go to joaosilva's homepage
24   - And I follow "Control panel" within ".profile-info-block"
25   - Then I should see "Joao Silva" within "span.control-panel-title"
26   - When I follow "Control panel" within ".profile-image-block"
  24 + And I follow "Control panel" within ".profile-image-block"
27 25 Then I should see "Joao Silva" within "span.control-panel-title"
28 26  
29 27 @selenium
... ...
features/profile_search.feature
... ... @@ -36,7 +36,7 @@ Feature: search inside a profile
36 36 | joaosilva | ProfileSearchBlock |
37 37 When I go to joaosilva's profile
38 38 And I fill in "q" with "bees" within ".profile-search-block"
39   - And I press "Search"
  39 + And I press "Search" within ".profile-search-block"
40 40 Then I should see "bees and butterflies" within ".main-block"
41 41  
42 42 Scenario: not display unpublished articles
... ...
features/register_enterprise.feature
... ... @@ -203,5 +203,5 @@ Feature: register enterprise
203 203  
204 204 Scenario: a user cant see button to register new enterprise if enterprise_registration disabled
205 205 Given feature "enterprise_registration" is disabled on environment
206   - When I am on /assets/enterprises
  206 + When I am on /search/enterprises
207 207 Then I should not see "New enterprise" link
... ...
features/search_enterprises.feature
... ... @@ -56,7 +56,7 @@ Feature: search enterprises
56 56 | owner | name | body | homepage |
57 57 | shop1 | Shoes home | This is the <i>homepage</i> of Shoes shop! It has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. We should probably talk about shoes. | true |
58 58 When I search enterprises for "shoes"
59   - And I choose the search filter "Full"
  59 + And I select "Full" from "display"
60 60 Then I should see "This is the homepage of" within ".search-enterprise-description"
61 61 And I should see "about sho..." within ".search-enterprise-description"
62 62  
... ... @@ -66,7 +66,7 @@ Feature: search enterprises
66 66 | identifier | name | description |
67 67 | shop4 | Clothes shop | This <b>clothes</b> shop also sells shoes! This too has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. Clothes are a really important part of our lives. |
68 68 When I search enterprises for "clothes"
69   - And I choose the search filter "Full"
  69 + And I select "Full" from "display"
70 70 And I should see "This clothes shop" within ".search-enterprise-description"
71 71 And I should see "really import..." within ".search-enterprise-description"
72 72  
... ...
features/suggest_article.feature
... ... @@ -14,9 +14,12 @@ Feature: suggest article
14 14  
15 15 @selenium
16 16 Scenario: highlight an article before approval of a suggested article
17   - Given someone suggested the following article to be published
18   - | target | article_name | article_body | name | email |
19   - | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
  17 + Given I am on Sample Community's blog
  18 + And I follow "Suggest an article"
  19 + And I fill in "Title" with "Suggestion"
  20 + And I fill in "Your name" with "Some Guy"
  21 + And I fill in "Email" with "someguy@somewhere.com"
  22 + And I press "Save"
20 23 When I am logged in as "joaosilva"
21 24 And I go to sample-community's control panel
22 25 And I follow "Process requests"
... ...