Download as
Browse Code »

Commit 632dc3efb8c933fb7db39ab99d2152c7eaf1eb05

Authored by Rodrigo Souto
1 parent c84e0cab
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

article-versioning: fix tests after html attribute change

Showing 2 changed files with 5 additions and 8 deletions   Show diff stats
features/article_versioning.feature
  Diff comments   View file @632dc3e
@@ -34,8 +34,8 @@ Feature: article versioning @@ -34,8 +34,8 @@ Feature: article versioning
34 Given I am on article "Edited Article" 34 Given I am on article "Edited Article"
35 When I follow "All versions" 35 When I follow "All versions"
36 Then I should be on /joaosilva/edited-article/versions 36 Then I should be on /joaosilva/edited-article/versions
37 - And I should see "Version 1" within ".article-versions"  
38 - And I should see "Version 2" within ".article-versions" 37 + And I should see "Version 1" within "#article-versions"
  38 + And I should see "Version 2" within "#article-versions"
39 39
40 @selenium 40 @selenium
41 Scenario: see specific version 41 Scenario: see specific version
@@ -51,13 +51,13 @@ Feature: article versioning @@ -51,13 +51,13 @@ Feature: article versioning
51 Scenario: revert to a specific version generates a new version 51 Scenario: revert to a specific version generates a new version
52 Given I go to article "Edited Article" 52 Given I go to article "Edited Article"
53 When I follow "All versions" 53 When I follow "All versions"
54 - Then I should not see "Version 3" within ".article-versions" 54 + Then I should not see "Version 3" within "#article-versions"
55 And I follow "Version 1" 55 And I follow "Version 1"
56 And I follow "Revert to this version" 56 And I follow "Revert to this version"
57 And I press "Save" 57 And I press "Save"
58 Then I should see "Sample Article" within ".title" 58 Then I should see "Sample Article" within ".title"
59 When I follow "All versions" 59 When I follow "All versions"
60 - Then I should see "Version 3" within ".article-versions" 60 + Then I should see "Version 3" within "#article-versions"
61 61
62 Scenario: try to access versions of unexistent article 62 Scenario: try to access versions of unexistent article
63 Given I go to /joaosilva/unexistent-article/versions 63 Given I go to /joaosilva/unexistent-article/versions
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @632dc3e
@@ -372,10 +372,7 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -372,10 +372,7 @@ class ContentViewerControllerTest < ActionController::TestCase
372 page.body = 'test article edited'; page.save 372 page.body = 'test article edited'; page.save
373 373
374 get :article_versions, :profile => profile.identifier, :page => [ 'myarticle' ] 374 get :article_versions, :profile => profile.identifier, :page => [ 'myarticle' ]
375 - assert_tag :tag => 'ul', :attributes => { :class => 'article-versions' }, :descendant => {  
376 - :tag => 'a',  
377 - :attributes => { :href => "http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?version=1" }  
378 - } 375 + assert_select "ul#article-versions a[href=http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?version=1]"
379 end 376 end
380 377
381 should "fetch correct article version" do 378 should "fetch correct article version" do