diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb')
-rw-r--r-- | spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb deleted file mode 100644 index 7cdc817d784..00000000000 --- a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe 'projects/merge_requests/diffs/_diffs.html.haml' do - include Devise::Test::ControllerHelpers - - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } - let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, author: user) } - - before do - allow(view).to receive(:url_for).and_return(controller.request.fullpath) - - assign(:merge_request, merge_request) - assign(:environment, merge_request.environments_for(user).last) - assign(:diffs, merge_request.diffs) - assign(:merge_request_diffs, merge_request.diffs) - assign(:diff_notes_disabled, true) # disable note creation - assign(:use_legacy_diff_notes, false) - assign(:grouped_diff_discussions, {}) - assign(:notes, []) - end - - context 'for a commit' do - let(:commit) { merge_request.commits.last } - - before do - assign(:commit, commit) - end - - it "shows the commit scope" do - render - - expect(rendered).to have_content "Only comments from the following commit are shown below" - end - end -end |