diff --git a/spec/system/comments/budget_investments_spec.rb b/spec/system/comments/budget_investments_spec.rb index 526bc2fe5..a998f736f 100644 --- a/spec/system/comments/budget_investments_spec.rb +++ b/spec/system/comments/budget_investments_spec.rb @@ -20,7 +20,7 @@ describe "Commenting Budget::Investments" do expect(page).to have_content "I am your Admin!" end - visit admin_budget_budget_investment_path(investment.budget, investment) + refresh within "#comments" do expect(page).to have_content "I am your Admin!" @@ -29,42 +29,6 @@ describe "Commenting Budget::Investments" do expect(page).to have_css "img.admin-avatar" end end - - scenario "display administrator id on public views" do - admin = create(:administrator, description: "user description") - - login_as(admin.user) - visit admin_budget_budget_investment_path(investment.budget, investment) - - fill_in "Leave your comment", with: "I am your Admin!" - check "comment-as-administrator-budget_investment_#{investment.id}" - click_button "Publish comment" - - within "#comments" do - expect(page).to have_content "I am your Admin!" - expect(page).to have_content "Administrator ##{admin.id}" - expect(page).to have_css "div.is-admin" - expect(page).to have_css "img.admin-avatar" - end - end - - scenario "public users not see admin description" do - manuela = create(:user, username: "Manuela") - admin = create(:administrator, user: manuela) - comment = create(:comment, - commentable: investment, - user: manuela, - administrator_id: admin.id) - - visit budget_investment_path(investment.budget, investment) - - within "#comment_#{comment.id}" do - expect(page).to have_content comment.body - expect(page).to have_content "Administrator ##{admin.id}" - expect(page).to have_css "img.admin-avatar" - expect(page).to have_css "div.is-admin" - end - end end end end diff --git a/spec/system/comments_spec.rb b/spec/system/comments_spec.rb index bf8ced835..c8a33de68 100644 --- a/spec/system/comments_spec.rb +++ b/spec/system/comments_spec.rb @@ -570,7 +570,7 @@ describe "Comments" do describe "Administrators" do scenario "can create comment" do - admin = create(:administrator) + admin = create(:administrator, description: "admin user") login_as(admin.user) visit polymorphic_path(resource) @@ -584,6 +584,7 @@ describe "Comments" do within "#comments" do expect(page).to have_content "I am your Admin!" expect(page).to have_content "Administrator ##{admin.id}" + expect(page).not_to have_content "Administrator admin user" expect(page).to have_css "div.is-admin" expect(page).to have_css "img.admin-avatar" end