diff options
Diffstat (limited to 'spec/features/projects/wiki')
11 files changed, 17 insertions, 13 deletions
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb index bc567d4db42..8eba2c98595 100644 --- a/spec/features/projects/wiki/markdown_preview_spec.rb +++ b/spec/features/projects/wiki/markdown_preview_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Wiki > User previews markdown changes', :js do +RSpec.describe 'Projects > Wiki > User previews markdown changes', :js do let_it_be(:user) { create(:user) } let(:project) { create(:project, :wiki_repo, namespace: user.namespace) } let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: '[some link](other-page)') } diff --git a/spec/features/projects/wiki/shortcuts_spec.rb b/spec/features/projects/wiki/shortcuts_spec.rb index c51af2526c9..170e7afb51f 100644 --- a/spec/features/projects/wiki/shortcuts_spec.rb +++ b/spec/features/projects/wiki/shortcuts_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Wiki shortcuts', :js do +RSpec.describe 'Wiki shortcuts', :js do let(:user) { create(:user) } let(:project) { create(:project, :wiki_repo, namespace: user.namespace) } let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: 'Home page') } diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb index 5678ebcb72a..eba1b63765a 100644 --- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe "User creates wiki page" do +RSpec.describe "User creates wiki page" do include WikiHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb index 38e5e292064..a5d865d581b 100644 --- a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User deletes wiki page', :js do +RSpec.describe 'User deletes wiki page', :js do let(:user) { create(:user) } let(:project) { create(:project, :wiki_repo, namespace: user.namespace) } let(:wiki_page) { create(:wiki_page, wiki: project.wiki) } diff --git a/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb b/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb index 6c6af1c41d2..83679c6bd1d 100644 --- a/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Wiki > User views Git access wiki page' do +RSpec.describe 'Projects > Wiki > User views Git access wiki page' do let(:user) { create(:user) } let(:project) { create(:project, :wiki_repo, :public) } let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: '[some link](other-page)') } diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb index 55509ddfa10..05d8989d88a 100644 --- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User updates wiki page' do +RSpec.describe 'User updates wiki page' do include WikiHelpers let(:user) { create(:user) } @@ -29,7 +29,7 @@ describe 'User updates wiki page' do click_on('Cancel') end - expect(current_path).to eq project_wiki_path(project, :home) + expect(current_path).to eq wiki_path(project.wiki) end it 'updates a page that has a path', :js do diff --git a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb index ab0f9b750d2..d9f79162c19 100644 --- a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User views empty wiki' do +RSpec.describe 'User views empty wiki' do let(:user) { create(:user) } shared_examples 'empty wiki and accessible issues' do @@ -12,6 +12,8 @@ describe 'User views empty wiki' do element = page.find('.row.empty-state') expect(element).to have_content('This project has no wiki pages') + expect(element).to have_content('You must be a project member') + expect(element).to have_content('improve the wiki for this project') expect(element).to have_link("issue tracker", href: project_issues_path(project)) expect(element).to have_link("Suggest wiki improvement", href: new_project_issue_path(project)) end @@ -24,6 +26,7 @@ describe 'User views empty wiki' do element = page.find('.row.empty-state') expect(element).to have_content('This project has no wiki pages') + expect(element).to have_content('You must be a project member') expect(element).to have_no_link('Suggest wiki improvement') end end @@ -66,9 +69,10 @@ describe 'User views empty wiki' do it 'show "create first page" message' do visit(project_wikis_path(project)) - element = page.find('.row.empty-state') + expect(element).to have_content('your project', count: 2) + element.click_link 'Create your first page' expect(page).to have_button('Create page') diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb index cb425e8b704..30b94495e3d 100644 --- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Wiki > User views wiki in project page' do +RSpec.describe 'Projects > Wiki > User views wiki in project page' do let(:user) { create(:user) } before do diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb index e379e7466db..59ccb83a9bb 100644 --- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User views a wiki page' do +RSpec.describe 'User views a wiki page' do include WikiHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/wiki/user_views_wiki_pages_spec.rb b/spec/features/projects/wiki/user_views_wiki_pages_spec.rb index 584b2a76143..fea913b8212 100644 --- a/spec/features/projects/wiki/user_views_wiki_pages_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_pages_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User views wiki pages' do +RSpec.describe 'User views wiki pages' do include WikiHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb b/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb index 014b63fa154..5c45e34595f 100644 --- a/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb +++ b/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User views AsciiDoc page with includes', :js do +RSpec.describe 'User views AsciiDoc page with includes', :js do let_it_be(:user) { create(:user) } let_it_be(:wiki_content_selector) { '[data-qa-selector=wiki_page_content]' } let(:project) { create(:project, :public, :wiki_repo) } |