Merge branch 'fix-flaky-specs' into 'master'
Fix Projects::MergeRequests::DiffsController specs See merge request gitlab-org/gitlab-ce!25253
This commit is contained in:
commit
a5cdbad0a6
2 changed files with 2 additions and 12 deletions
|
@ -1,7 +1,6 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
|
||||
include DiffForPath
|
||||
include DiffHelper
|
||||
include RendersNotes
|
||||
|
||||
|
|
|
@ -4,10 +4,11 @@ describe Projects::MergeRequests::DiffsController do
|
|||
include ProjectForksHelper
|
||||
|
||||
let(:project) { create(:project, :repository) }
|
||||
let(:user) { project.owner }
|
||||
let(:user) { create(:user) }
|
||||
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
|
||||
|
||||
before do
|
||||
project.add_maintainer(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
|
@ -114,16 +115,6 @@ describe Projects::MergeRequests::DiffsController do
|
|||
expect(paths).to include(existing_path)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the path does not exist in the diff' do
|
||||
before do
|
||||
diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb')
|
||||
end
|
||||
|
||||
it 'returns a 404' do
|
||||
expect(response).to have_gitlab_http_status(404)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the user cannot view the merge request' do
|
||||
|
|
Loading…
Reference in a new issue