fixed merge conflict and refactored specs

spec/requests/api/internal_spec.rb

@@ -6,8 +6,6 @@ describe API::API, api: true  do
   let(:key) { create(:key, user: user) }
   let(:project) { create(:project) }
   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
     it do
@@ -57,12 +55,10 @@ describe API::API, api: true  do
       end
 
       context "git push with project.wiki" do
-
-        before do
+        it 'responds with success' do
+          project_wiki = create(:project, name: 'my.wiki', path: 'my.wiki')
           project_wiki.team << [user, :developer]
-        end
 
-        it do
           push(key, project_wiki)
 
           expect(response.status).to eq(200)