Commit 3365e3eb authored by Valery Sizov's avatar Valery Sizov

[CE->EE][ci skip] Resolve conflicts

parent 99db2b9f
......@@ -59,13 +59,9 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
list_boards format: :json
<<<<<<< HEAD
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
=======
expect(response).to have_gitlab_http_status(404)
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
......@@ -118,13 +114,9 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
read_board board: board, format: :json
<<<<<<< HEAD
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
=======
expect(response).to have_gitlab_http_status(404)
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
......
......@@ -22,7 +22,6 @@ describe Projects::EnvironmentsController do
get :index, environment_params
expect(response).to have_gitlab_http_status(:ok)
<<<<<<< HEAD
end
it 'expires etag cache to force reload environments list' do
......@@ -30,8 +29,6 @@ describe Projects::EnvironmentsController do
.to receive(:touch).with(project_environments_path(project, format: :json))
get :index, environment_params
=======
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
......
......@@ -854,7 +854,6 @@ describe Projects::IssuesController do
before do
project.add_developer(user)
sign_in(user)
<<<<<<< HEAD
end
it 'returns discussion json' do
......@@ -893,12 +892,9 @@ describe Projects::IssuesController do
expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid }.not_to exceed_query_limit(control_count)
end
=======
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
<<<<<<< HEAD
context 'with a related system note' do
let(:confidential_issue) { create(:issue, :confidential, project: project) }
let!(:system_note) { SystemNoteService.relate_issue(issue, confidential_issue, user) }
......@@ -955,7 +951,8 @@ describe Projects::IssuesController do
let(:project) { create(:project, :public) }
it_behaves_like 'user cannot see confidential issue', Gitlab::Access::NO_ACCESS
=======
end
it 'returns discussion json' do
get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
......@@ -992,7 +989,6 @@ describe Projects::IssuesController do
expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid }.not_to exceed_query_limit(control_count)
end
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
end
......
......@@ -51,7 +51,6 @@ describe Projects::RawController do
get_show(public_project, id)
expect(response).to have_gitlab_http_status(200)
<<<<<<< HEAD
end
context 'and lfs uses object storage' do
......@@ -77,8 +76,6 @@ describe Projects::RawController do
expect(params["response-content-disposition"].first).to eq 'attachment;filename="lfs_object.iso"'
end
=======
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
......
......@@ -223,7 +223,14 @@ describe ProjectsController do
expect(response).to render_template('_files')
end
<<<<<<< HEAD
it "renders the readme view" do
allow(controller).to receive(:current_user).and_return(user)
allow(user).to receive(:project_view).and_return('readme')
get :show, namespace_id: public_project.namespace, id: public_project
expect(response).to render_template('_readme')
end
context 'project repo over limit' do
before do
allow_any_instance_of(EE::Project)
......@@ -245,14 +252,6 @@ describe ProjectsController do
expect(response).not_to render_template('_above_size_limit_warning')
end
=======
it "renders the readme view" do
allow(controller).to receive(:current_user).and_return(user)
allow(user).to receive(:project_view).and_return('readme')
get :show, namespace_id: public_project.namespace, id: public_project
expect(response).to render_template('_readme')
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
end
end
......
......@@ -20,7 +20,6 @@ describe Gitlab::Saml::User do
let(:ldap_user) { Gitlab::LDAP::Person.new(Net::LDAP::Entry.new, 'ldapmain') }
describe '#save' do
<<<<<<< HEAD
def stub_omniauth_config(messages)
allow(Gitlab.config.omniauth).to receive_messages(messages)
end
......@@ -41,8 +40,6 @@ describe Gitlab::Saml::User do
allow(Gitlab::Saml::Config).to receive_messages({ options: { name: 'saml', groups_attribute: 'groups', admin_groups: groups, args: {} } })
end
=======
>>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
before do
stub_basic_saml_config
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