Commit 3ac202c3 authored by James Lopez's avatar James Lopez

fixed merge conflict and refactored specs

parent 6b27b9f9
...@@ -6,8 +6,6 @@ describe API::API, api: true do ...@@ -6,8 +6,6 @@ describe API::API, api: true do
let(:key) { create(:key, user: user) } let(:key) { create(:key, user: user) }
let(:project) { create(:project) } let(:project) { create(:project) }
let(:secret_token) { File.read Gitlab.config.gitlab_shell.secret_file } let(:secret_token) { File.read Gitlab.config.gitlab_shell.secret_file }
# Project with path ending in .wiki
let(:project_wiki) { create(:project, name: 'my.wiki', path: 'my.wiki') }
describe "GET /internal/check", no_db: true do describe "GET /internal/check", no_db: true do
it do it do
...@@ -57,12 +55,10 @@ describe API::API, api: true do ...@@ -57,12 +55,10 @@ describe API::API, api: true do
end end
context "git push with project.wiki" do context "git push with project.wiki" do
it 'responds with success' do
before do project_wiki = create(:project, name: 'my.wiki', path: 'my.wiki')
project_wiki.team << [user, :developer] project_wiki.team << [user, :developer]
end
it do
push(key, project_wiki) push(key, project_wiki)
expect(response.status).to eq(200) expect(response.status).to eq(200)
......
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