diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /spec/features | |
parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
7 files changed, 56 insertions, 18 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index ed05ad60ff0..8eb15bb6bf5 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -489,7 +489,6 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc end def check_all_events - page.check('Active') page.check('Push') page.check('Issue') page.check('Confidential issue') diff --git a/spec/features/dashboard/snippets_spec.rb b/spec/features/dashboard/snippets_spec.rb index db5e56bdde0..287af7e7b11 100644 --- a/spec/features/dashboard/snippets_spec.rb +++ b/spec/features/dashboard/snippets_spec.rb @@ -3,8 +3,10 @@ require 'spec_helper' describe 'Dashboard snippets' do + let_it_be(:user) { create(:user) } + context 'when the project has snippets' do - let(:project) { create(:project, :public) } + let(:project) { create(:project, :public, creator: user) } let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) } before do @@ -22,7 +24,7 @@ describe 'Dashboard snippets' do end context 'when there are no project snippets', :js do - let(:project) { create(:project, :public) } + let(:project) { create(:project, :public, creator: user) } before do sign_in(project.owner) @@ -47,9 +49,49 @@ describe 'Dashboard snippets' do end end + context 'rendering file names' do + let_it_be(:snippet) { create(:personal_snippet, :public, author: user, file_name: 'foo.txt') } + let_it_be(:versioned_snippet) { create(:personal_snippet, :repository, :public, author: user, file_name: 'bar.txt') } + + before do + sign_in(user) + end + + context 'when feature flag :version_snippets is disabled' do + before do + stub_feature_flags(version_snippets: false) + + visit dashboard_snippets_path + end + + it 'contains the snippet file names from the DB' do + aggregate_failures do + expect(page).to have_content 'foo.txt' + expect(page).to have_content('bar.txt') + expect(page).not_to have_content('.gitattributes') + end + end + end + + context 'when feature flag :version_snippets is enabled' do + before do + stub_feature_flags(version_snippets: true) + + visit dashboard_snippets_path + end + + it 'contains both the versioned and non-versioned filenames' do + aggregate_failures do + expect(page).to have_content 'foo.txt' + expect(page).to have_content('.gitattributes') + expect(page).not_to have_content('bar.txt') + end + end + end + end + context 'filtering by visibility' do - let(:user) { create(:user) } - let!(:snippets) do + let_it_be(:snippets) do [ create(:personal_snippet, :public, author: user), create(:personal_snippet, :internal, author: user), @@ -99,7 +141,7 @@ describe 'Dashboard snippets' do end context 'as an external user' do - let(:user) { create(:user, :external) } + let_it_be(:user) { create(:user, :external) } before do sign_in(user) diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb index 0b0a3362043..4f3fb6ac3bf 100644 --- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb +++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb @@ -9,7 +9,7 @@ describe 'User activates issue tracker', :js do let(:url) { 'http://tracker.example.com' } def fill_short_form(disabled: false) - uncheck 'Active' if disabled + find('input[name="service[active]"] + button').click if disabled fill_in 'service_project_url', with: url fill_in 'service_issues_url', with: "#{url}/:id" diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb index 557615f8872..fb9628032b2 100644 --- a/spec/features/projects/services/user_activates_jira_spec.rb +++ b/spec/features/projects/services/user_activates_jira_spec.rb @@ -10,7 +10,7 @@ describe 'User activates Jira', :js do let(:test_url) { 'http://jira.example.com/rest/api/2/serverInfo' } def fill_form(disabled: false) - uncheck 'Active' if disabled + find('input[name="service[active]"] + button').click if disabled fill_in 'service_url', with: url fill_in 'service_username', with: 'username' @@ -53,7 +53,6 @@ describe 'User activates Jira', :js do it 'shows errors when some required fields are not filled in' do click_link('Jira') - check 'Active' fill_in 'service_password', with: 'password' click_button('Test settings and save changes') diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb index 2eaa2d24c4b..ac9cb00be84 100644 --- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb @@ -5,14 +5,13 @@ require 'spec_helper' describe 'Set up Mattermost slash commands', :js do let(:user) { create(:user) } let(:project) { create(:project) } - let(:service) { project.create_mattermost_slash_commands_service } let(:mattermost_enabled) { true } before do stub_mattermost_setting(enabled: mattermost_enabled) project.add_maintainer(user) sign_in(user) - visit edit_project_service_path(project, service) + visit edit_project_service_path(project, :mattermost_slash_commands) end describe 'user visits the mattermost slash command config page' do @@ -30,6 +29,7 @@ describe 'Set up Mattermost slash commands', :js do token = ('a'..'z').to_a.join fill_in 'service_token', with: token + find('input[name="service[active]"] + button').click click_on 'Save changes' expect(current_path).to eq(project_settings_integrations_path(project)) @@ -40,7 +40,6 @@ describe 'Set up Mattermost slash commands', :js do token = ('a'..'z').to_a.join fill_in 'service_token', with: token - check 'service_active' click_on 'Save changes' expect(current_path).to eq(project_settings_integrations_path(project)) diff --git a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb index 752ef8d592d..4ce1acd9377 100644 --- a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb +++ b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb @@ -5,12 +5,11 @@ require 'spec_helper' describe 'Slack slash commands' do let(:user) { create(:user) } let(:project) { create(:project) } - let(:service) { project.create_slack_slash_commands_service } before do project.add_maintainer(user) sign_in(user) - visit edit_project_service_path(project, service) + visit edit_project_service_path(project, :slack_slash_commands) end it 'shows a token placeholder' do @@ -23,17 +22,17 @@ describe 'Slack slash commands' do expect(page).to have_content('This service allows users to perform common') end - it 'redirects to the integrations page after saving but not activating' do + it 'redirects to the integrations page after saving but not activating', :js do fill_in 'service_token', with: 'token' + find('input[name="service[active]"] + button').click click_on 'Save' expect(current_path).to eq(project_settings_integrations_path(project)) expect(page).to have_content('Slack slash commands settings saved, but not activated.') end - it 'redirects to the integrations page after activating' do + it 'redirects to the integrations page after activating', :js do fill_in 'service_token', with: 'token' - check 'service_active' click_on 'Save' expect(current_path).to eq(project_settings_integrations_path(project)) diff --git a/spec/features/projects/services/user_activates_youtrack_spec.rb b/spec/features/projects/services/user_activates_youtrack_spec.rb index 2f6aad1d736..26734766ff0 100644 --- a/spec/features/projects/services/user_activates_youtrack_spec.rb +++ b/spec/features/projects/services/user_activates_youtrack_spec.rb @@ -9,7 +9,7 @@ describe 'User activates issue tracker', :js do let(:url) { 'http://tracker.example.com' } def fill_form(disabled: false) - uncheck 'Active' if disabled + find('input[name="service[active]"] + button').click if disabled fill_in 'service_project_url', with: url fill_in 'service_issues_url', with: "#{url}/:id" |