summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git/wiki_spec.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-06-18 17:29:48 +0900
committerShinya Maeda <shinya@gitlab.com>2018-06-18 17:29:48 +0900
commit71e30c011957229dfa4029b9b04e5308ceed4fcd (patch)
tree2bfbff9907fa37a5bfba3c744439e09c7381c06f /spec/lib/gitlab/git/wiki_spec.rb
parent1aeedf41f8681bbc638dde8b8a263a7d7cd13a1e (diff)
parent39208ed6750e31d10e4bad5a33693a83eb599f1f (diff)
downloadgitlab-ce-71e30c011957229dfa4029b9b04e5308ceed4fcd.tar.gz
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'spec/lib/gitlab/git/wiki_spec.rb')
-rw-r--r--spec/lib/gitlab/git/wiki_spec.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/lib/gitlab/git/wiki_spec.rb b/spec/lib/gitlab/git/wiki_spec.rb
index 35b06b14620..b63658e1b3b 100644
--- a/spec/lib/gitlab/git/wiki_spec.rb
+++ b/spec/lib/gitlab/git/wiki_spec.rb
@@ -6,9 +6,7 @@ describe Gitlab::Git::Wiki do
let(:project_wiki) { ProjectWiki.new(project, user) }
subject { project_wiki.wiki }
- # Remove skip_gitaly_mock flag when gitaly_find_page when
- # https://gitlab.com/gitlab-org/gitlab-ce/issues/42039 is solved
- describe '#page', :skip_gitaly_mock do
+ describe '#page' do
before do
create_page('page1', 'content')
create_page('foo/page1', 'content foo/page1')
@@ -25,7 +23,7 @@ describe Gitlab::Git::Wiki do
end
end
- describe '#delete_page', :skip_gitaly_mock do
+ describe '#delete_page' do
after do
destroy_page('page1')
end