3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
129 lines
3.4 KiB
Ruby
129 lines
3.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe "GitLab Flavored Markdown" do
|
|
let(:project) { create(:project_with_code) }
|
|
let(:issue) { create(:issue, project: project) }
|
|
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
|
|
let(:fred) do
|
|
u = create(:user, name: "fred")
|
|
project.team << [u, :master]
|
|
u
|
|
end
|
|
|
|
before do
|
|
Commit.any_instance.stub(title: "fix ##{issue.id}\n\nask @#{fred.username} for details")
|
|
end
|
|
|
|
let(:commit) { project.repository.commit }
|
|
|
|
before do
|
|
login_as :user
|
|
project.team << [@user, :developer]
|
|
end
|
|
|
|
describe "for commits" do
|
|
it "should render title in commits#index" do
|
|
visit project_commits_path(project, 'master', limit: 1)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
|
|
it "should render title in commits#show" do
|
|
visit project_commit_path(project, commit)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
|
|
it "should render description in commits#show" do
|
|
visit project_commit_path(project, commit)
|
|
|
|
page.should have_link("@#{fred.username}")
|
|
end
|
|
|
|
it "should render title in repositories#branches" do
|
|
visit project_branches_path(project)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
end
|
|
|
|
describe "for issues" do
|
|
before do
|
|
@other_issue = create(:issue,
|
|
author: @user,
|
|
assignee: @user,
|
|
project: project)
|
|
@issue = create(:issue,
|
|
author: @user,
|
|
assignee: @user,
|
|
project: project,
|
|
title: "fix ##{@other_issue.id}",
|
|
description: "ask @#{fred.username} for details")
|
|
end
|
|
|
|
it "should render subject in issues#index" do
|
|
visit project_issues_path(project)
|
|
|
|
page.should have_link("##{@other_issue.id}")
|
|
end
|
|
|
|
it "should render subject in issues#show" do
|
|
visit project_issue_path(project, @issue)
|
|
|
|
page.should have_link("##{@other_issue.id}")
|
|
end
|
|
|
|
it "should render details in issues#show" do
|
|
visit project_issue_path(project, @issue)
|
|
|
|
page.should have_link("@#{fred.username}")
|
|
end
|
|
end
|
|
|
|
|
|
describe "for merge requests" do
|
|
before do
|
|
@merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix ##{issue.id}")
|
|
end
|
|
|
|
it "should render title in merge_requests#index" do
|
|
visit project_merge_requests_path(project)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
|
|
it "should render title in merge_requests#show" do
|
|
visit project_merge_request_path(project, @merge_request)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
end
|
|
|
|
|
|
describe "for milestones" do
|
|
before do
|
|
@milestone = create(:milestone,
|
|
project: project,
|
|
title: "fix ##{issue.id}",
|
|
description: "ask @#{fred.username} for details")
|
|
end
|
|
|
|
it "should render title in milestones#index" do
|
|
visit project_milestones_path(project)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
|
|
it "should render title in milestones#show" do
|
|
visit project_milestone_path(project, @milestone)
|
|
|
|
page.should have_link("##{issue.id}")
|
|
end
|
|
|
|
it "should render description in milestones#show" do
|
|
visit project_milestone_path(project, @milestone)
|
|
|
|
page.should have_link("@#{fred.username}")
|
|
end
|
|
end
|
|
end
|