Download as
Browse Code »

Commit 9d281ff838a9ec58571f5a0320d1cb69b5abb7c2

Authored by Daniela Feitosa
1 parent f776b5f6
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixed test: features/profile_domain.feature

Showing 3 changed files with 33 additions and 32 deletions   Show diff stats
features/profile_domain.feature
  Diff comments   View file @9d281ff
... ... @@ -12,48 +12,49 @@ Feature: domain for profile
12 12 | sample-community | Sample Community | localhost |
13 13 And the following blocks
14 14 | owner | type |
15   - | sample-community | ProfileImageBlock |
16   - | sample-community | ProfileInfoBlock |
  15 + | joaosilva | ProfileInfoBlock |
17 16 And the environment domain is "127.0.0.1"
  17 + And "Joao Silva" is environment admin
18 18 And "Joao Silva" is admin of "Sample Community"
19 19  
20 20 @selenium
21 21 Scenario: access profile control panel through profile blocks
22 22 Given I am logged in as "joaosilva"
23   - When I visit "/" and wait
24   - And I follow "Control panel" within "div.profile-info-block" and wait
25   - Then I should see "Sample Community" within "span.control-panel-title"
26   - When I visit "/" and wait
27   - And I follow "Control panel" within "div.profile-image-block" and wait
28   - Then I should see "Sample Community" within "span.control-panel-title"
  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"
  27 + Then I should see "Joao Silva" within "span.control-panel-title"
29 28  
30 29 @selenium
31 30 Scenario: access user control panel
32 31 Given I am logged in as "joaosilva"
33   - When I visit "/" and wait
34   - And I follow "joaosilva" and wait
  32 + When I go to the homepage
  33 + And I follow "joaosilva"
  34 + And I go to sample-community's homepage
35 35 And I follow "Login"
36 36 And I fill in "joaosilva" for "Username"
37 37 And I fill in "123456" for "Password"
38   - And I press "Log in" and wait
39   - And I follow "Control panel" within "div#user" and wait
  38 + And I press "Log in"
  39 + And I follow "Control panel" within "div#user"
40 40 Then I should see "Joao Silva" within "span.control-panel-title"
41 41  
42 42 @selenium
43 43 Scenario: access user page
44 44 Given I am logged in as "joaosilva"
45   - When I visit "/" and wait
46   - And I follow "joaosilva" and wait
47   - Then The page title should contain "Joao Silva"
  45 + When I go to the homepage
  46 + And I follow "joaosilva"
  47 + Then the page title should be "Joao Silva"
48 48  
49   - @selenium
  49 + @selenium @fixme
50 50 Scenario: access community by domain
51   - When I go to the homepage
52   - Then The page title should contain "Sample Community"
  51 + Given I go to the search communities page
  52 + When I follow "Sample Community" within ".search-profile-item"
  53 + Then the page title should be "Sample Community"
53 54  
54   - @selenium
  55 + @selenium @fixme
55 56 Scenario: Go to profile homepage after clicking on home button on not found page
56   - Given I am on the homepage
  57 + Given I am on sample-community's homepage
57 58 When I go to /something-that-does-not-exist
58 59 And I follow "Go to the home page"
59 60 Then the page title should be "Sample Community - Colivre.net"
... ... @@ -61,13 +62,11 @@ Feature: domain for profile
61 62 @selenium
62 63 Scenario: Go to environment homepage after clicking on home button on not found page
63 64 Given I am on the homepage
64   - And I click on the logo
65   - When I open /something-that-does-not-exist
  65 + When I go to /something-that-does-not-exist
66 66 And I follow "Go to the home page"
67 67 Then the page title should be "Colivre.net"
68 68  
69 69 @selenium
70 70 Scenario: Compose link to administration with environment domain
71 71 Given I am logged in as "joaosilva"
72   - When I visit "/" and wait
73   - Then I should see "Administration" linking to "http://127.0.0.1/admin"
  72 + Then I should see "Administration" linking to "http://127.0.0.1.*/admin"
... ...
features/step_definitions/custom_web_steps.rb
  Diff comments   View file @9d281ff
... ... @@ -13,8 +13,7 @@ Then /^I should not see "([^"]*)" link$/ do |text|
13 13 end
14 14  
15 15 When /^I should see "([^\"]+)" linking to "([^\"]+)"$/ do |text, href|
16   - page.should have_selector("a:contains('#{text}')")
17   - page.should have_selector("a[href='#{href}']")
  16 + page.should have_xpath("//a", :href => /#{href}/)
18 17 end
19 18  
20 19 When /^I reload and wait for the page$/ do
... ...
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @9d281ff
... ... @@ -299,6 +299,13 @@ Given /^I am logged in as "(.+)"$/ do |username|
299 299 Then %{I should be on #{username}'s control panel}
300 300 end
301 301  
  302 +Given /^"([^"]*)" is environment admin$/ do |person|
  303 + user = Profile.find_by_name(person)
  304 + e = Environment.default
  305 +
  306 + e.add_admin(user)
  307 +end
  308 +
302 309 Given /^I am logged in as admin$/ do
303 310 visit('/account/logout')
304 311 user = User.create!(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
... ... @@ -414,12 +421,8 @@ Given /^enterprise "([^\"]*)" is disabled$/ do |enterprise_name|
414 421 enterprise.save
415 422 end
416 423  
417   -Then /^The page title should contain "(.*)"$/ do |text|
418   - if response.class.to_s == 'Webrat::SeleniumResponse'
419   - response.selenium.text('css=title').should include(text)
420   - else
421   - response.should have_selector("title:contains('#{text}')")
422   - end
  424 +Then /^the page title should be "(.*)"$/ do |text|
  425 + Then %{I should see "#{text}" within "title"}
423 426 end
424 427  
425 428 Then /^The page should contain "(.*)"$/ do |selector|
... ...