Commit 93498185 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' into 'master'

Replace the `project/issues/references.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!18769
parents f4c36fac f5c8bfea
---
title: 'Replace the `project/issues/references.feature` spinach test with an rspec analog'
merge_request: 18769
author: '@blackst0ne'
type: other
@project_issues
Feature: Project Issues References
Background:
Given I sign in as "John Doe"
And public project "Community"
And "John Doe" owns public project "Community"
And project "Community" has "Community issue" open issue
And I logout
And I sign in as "Mary Jane"
And private project "Enterprise"
And "Mary Jane" owns private project "Enterprise"
And project "Enterprise" has "Enterprise issue" open issue
And project "Enterprise" has "Enterprise fix" open merge request
And I visit issue page "Enterprise issue"
And I leave a comment referencing issue "Community issue"
And I visit merge request page "Enterprise fix"
And I leave a comment referencing issue "Community issue"
And I logout
@javascript
Scenario: Viewing the public issue as a "John Doe"
Given I sign in as "John Doe"
When I visit issue page "Community issue"
Then I should not see any related merge requests
And I should see no notes at all
@javascript
Scenario: Viewing the public issue as "Mary Jane"
Given I sign in as "Mary Jane"
When I visit issue page "Community issue"
Then I should see the "Enterprise fix" related merge request
And I should see a note linking to "Enterprise fix" merge request
And I should see a note linking to "Enterprise issue" issue
...@@ -5,13 +5,6 @@ module SharedIssuable ...@@ -5,13 +5,6 @@ module SharedIssuable
find('.js-issuable-edit', visible: true).click find('.js-issuable-edit', visible: true).click
end end
step 'project "Community" has "Community issue" open issue' do
create_issuable_for_project(
project_name: 'Community',
title: 'Community issue'
)
end
step 'project "Community" has "Community fix" open merge request' do step 'project "Community" has "Community fix" open merge request' do
create_issuable_for_project( create_issuable_for_project(
project_name: 'Community', project_name: 'Community',
...@@ -59,32 +52,11 @@ module SharedIssuable ...@@ -59,32 +52,11 @@ module SharedIssuable
visit project_merge_request_path(mr.target_project, mr) visit project_merge_request_path(mr.target_project, mr)
end end
step 'I visit issue page "Community issue"' do
issue = Issue.find_by(title: 'Community issue')
visit project_issue_path(issue.project, issue)
end
step 'I visit issue page "Community fix"' do step 'I visit issue page "Community fix"' do
mr = MergeRequest.find_by(title: 'Community fix') mr = MergeRequest.find_by(title: 'Community fix')
visit project_merge_request_path(mr.target_project, mr) visit project_merge_request_path(mr.target_project, mr)
end end
step 'I should not see any related merge requests' do
page.within '.issue-details' do
expect(page).not_to have_content('#merge-requests .merge-requests-title')
end
end
step 'I should see the "Enterprise fix" related merge request' do
page.within '#merge-requests .merge-requests-title' do
expect(page).to have_content('1 Related Merge Request')
end
page.within '#merge-requests ul' do
expect(page).to have_content('Enterprise fix')
end
end
step 'I should see a note linking to "Enterprise fix" merge request' do step 'I should see a note linking to "Enterprise fix" merge request' do
visible_note( visible_note(
issuable: MergeRequest.find_by(title: 'Enterprise fix'), issuable: MergeRequest.find_by(title: 'Enterprise fix'),
......
require "rails_helper"
describe "Internal references", :js do
include Spec::Support::Helpers::Features::NotesHelpers
let(:private_project_user) { private_project.owner }
let(:private_project) { create(:project, :private, :repository) }
let(:private_project_issue) { create(:issue, project: private_project) }
let(:private_project_merge_request) { create(:merge_request, source_project: private_project) }
let(:public_project_user) { public_project.owner }
let(:public_project) { create(:project, :public, :repository) }
let(:public_project_issue) { create(:issue, project: public_project) }
context "when referencing to open issue" do
context "from private project" do
context "from issue" do
before do
sign_in(private_project_user)
visit(project_issue_path(private_project, private_project_issue))
add_note("##{public_project_issue.to_reference(private_project)}")
end
context "when user doesn't have access to private project" do
before do
sign_in(public_project_user)
visit(project_issue_path(public_project, public_project_issue))
end
it { expect(page).not_to have_css(".note") }
end
end
context "from merge request" do
before do
sign_in(private_project_user)
visit(project_merge_request_path(private_project, private_project_merge_request))
add_note("##{public_project_issue.to_reference(private_project)}")
end
context "when user doesn't have access to private project" do
before do
sign_in(public_project_user)
visit(project_issue_path(public_project, public_project_issue))
end
it "doesn't show any references" do
page.within(".issue-details") do
expect(page).not_to have_content("#merge-requests .merge-requests-title")
end
end
end
context "when user has access to private project" do
before do
visit(project_issue_path(public_project, public_project_issue))
end
it "shows references" do
page.within("#merge-requests .merge-requests-title") do
expect(page).to have_content("1 Related Merge Request")
end
page.within("#merge-requests ul") do
expect(page).to have_content(private_project_merge_request.title)
end
expect(page).to have_content("mentioned in merge request #{private_project_merge_request.to_reference(public_project)}")
.and have_content(private_project_user.name)
end
end
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment