diff options
author | James Lopez <james@jameslopez.es> | 2016-02-29 10:59:16 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-02-29 10:59:16 +0100 |
commit | 3ac202c30f3fdabc5189d411dfe5e7871b948070 (patch) | |
tree | 790c311bdaebda0b3988b343254977f757a3f132 | |
parent | 6b27b9f91c0337625cd2745fbd55789405e8a643 (diff) | |
download | gitlab-ce-3ac202c30f3fdabc5189d411dfe5e7871b948070.tar.gz |
fixed merge conflict and refactored specs
-rw-r--r-- | spec/requests/api/internal_spec.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 1398dcc1918..22802dd0e05 100644 --- a/spec/requests/api/internal_spec.rb +++ b/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) |