Merge branch 'group-wiki-diffing' into 'master'

Enable spec for diffing in group wikis See merge request gitlab-org/gitlab!44334

Merge branch 'group-wiki-diffing' into 'master'
Enable spec for diffing in group wikis See merge request gitlab-org/gitlab!44334
03e0978c · Douglas Barbosa Alexandre · 4c1368a9 · e8a3b82e · 03e0978c
Commit 03e0978c authored Oct 05, 2020 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb ...les/features/wiki/user_views_wiki_page_shared_examples.rb +0 -4

No files found.
--- a/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
@@ -137,10 +137,6 @@ RSpec.shared_examples 'User views a wiki page' do
    end

    context 'show the diff' do
-      before do
-        skip('Diffing for group wikis will be implemented in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42610') if wiki.container.is_a?(Group)
-      end
-
      def expect_diff_links(commit)
        diff_path = wiki_page_path(wiki, wiki_page, version_id: commit, action: :diff)