diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:45 +0300 |
| commit | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (patch) | |
| tree | 78ba4c486ad8aa2d5effaccf23241ffb6c6dde26 /spec/models | |
| parent | ce8a0b90849ac5d1895e741c023432930f24d724 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/wiki_page_spec.rb | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index dd6690b4d1e..42a7d567613 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -480,29 +480,39 @@ describe WikiPage do let(:untitled_page) { described_class.new(wiki) } let(:directory_page) do - create_page('parent/child', 'test content') - wiki.find_page('parent/child') + create_page('parent directory/child page', 'test content') + wiki.find_page('parent directory/child page') end where(:page, :title, :changed) do - :untitled_page | nil | false - :untitled_page | 'new title' | true - - :new_page | nil | true - :new_page | 'test page' | true - :new_page | 'new title' | true - - :existing_page | nil | false - :existing_page | 'test page' | false - :existing_page | '/test page' | false - :existing_page | 'new title' | true - - :directory_page | nil | false - :directory_page | 'parent/child' | false - :directory_page | 'child' | false - :directory_page | '/child' | true - :directory_page | 'parent/other' | true - :directory_page | 'other/child' | true + :untitled_page | nil | false + :untitled_page | 'new title' | true + + :new_page | nil | true + :new_page | 'test page' | true + :new_page | 'new title' | true + + :existing_page | nil | false + :existing_page | 'test page' | false + :existing_page | 'test-page' | false + :existing_page | '/test page' | false + :existing_page | '/test-page' | false + :existing_page | ' test page ' | true + :existing_page | 'new title' | true + :existing_page | 'new-title' | true + + :directory_page | nil | false + :directory_page | 'parent directory/child page' | false + :directory_page | 'parent-directory/child page' | false + :directory_page | 'parent-directory/child-page' | false + :directory_page | 'child page' | false + :directory_page | 'child-page' | false + :directory_page | '/child page' | true + :directory_page | 'parent directory/other' | true + :directory_page | 'parent-directory/other' | true + :directory_page | 'parent-directory / child-page' | true + :directory_page | 'other directory/child page' | true + :directory_page | 'other-directory/child page' | true end with_them do |