diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 04:43:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 04:43:31 +0300 |
commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /spec/features | |
parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/features')
6 files changed, 53 insertions, 30 deletions
diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb index 3fbc7c7a695..5b1a9512c55 100644 --- a/spec/features/groups/settings/ci_cd_spec.rb +++ b/spec/features/groups/settings/ci_cd_spec.rb @@ -37,19 +37,6 @@ describe 'Group CI/CD settings' do end end - context 'Deploy tokens' do - let!(:deploy_token) { create(:deploy_token, :group, groups: [group]) } - - before do - stub_container_registry_config(enabled: true) - visit group_settings_ci_cd_path(group) - end - - it_behaves_like 'a deploy token in ci/cd settings' do - let(:entity_type) { 'group' } - end - end - describe 'Auto DevOps form' do before do stub_application_setting(auto_devops_enabled: true) diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb new file mode 100644 index 00000000000..722fd98ce59 --- /dev/null +++ b/spec/features/groups/settings/repository_spec.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'Group Repository settings' do + include WaitForRequests + + let(:user) { create(:user) } + let(:group) { create(:group) } + + before do + group.add_owner(user) + sign_in(user) + end + + context 'Deploy tokens' do + let!(:deploy_token) { create(:deploy_token, :group, groups: [group]) } + + before do + stub_container_registry_config(enabled: true) + visit group_settings_repository_path(group) + end + + it_behaves_like 'a deploy token in settings' do + let(:entity_type) { 'group' } + end + end +end diff --git a/spec/features/ide/user_commits_changes_spec.rb b/spec/features/ide/user_commits_changes_spec.rb index f53abde1523..56f2c6b8afc 100644 --- a/spec/features/ide/user_commits_changes_spec.rb +++ b/spec/features/ide/user_commits_changes_spec.rb @@ -30,4 +30,14 @@ describe 'IDE user commits changes', :js do expect(project.repository.blob_at('master', 'foo/bar/.gitkeep')).to be_nil expect(project.repository.blob_at('master', 'foo/bar/lorem_ipsum.md').data).to eql(content) end + + it 'user adds then deletes new file' do + ide_create_new_file('foo/bar/lorem_ipsum.md') + + expect(page).to have_selector(ide_commit_tab_selector) + + ide_delete_file('foo/bar/lorem_ipsum.md') + + expect(page).not_to have_selector(ide_commit_tab_selector) + end end diff --git a/spec/features/projects/settings/ci_cd_settings_spec.rb b/spec/features/projects/settings/ci_cd_settings_spec.rb index d8208a93bb1..ed65dcd85ab 100644 --- a/spec/features/projects/settings/ci_cd_settings_spec.rb +++ b/spec/features/projects/settings/ci_cd_settings_spec.rb @@ -7,22 +7,6 @@ describe 'Projects > Settings > CI / CD settings' do let_it_be(:user) { create(:user) } let_it_be(:role) { :maintainer } - context 'Deploy tokens' do - let!(:deploy_token) { create(:deploy_token, projects: [project]) } - - before do - project.add_role(user, role) - sign_in(user) - stub_container_registry_config(enabled: true) - stub_feature_flags(ajax_new_deploy_token: { enabled: false, thing: project }) - visit project_settings_ci_cd_path(project) - end - - it_behaves_like 'a deploy token in ci/cd settings' do - let(:entity_type) { 'project' } - end - end - context 'Deploy Keys', :js do let_it_be(:private_deploy_key) { create(:deploy_key, title: 'private_deploy_key', public: false) } let_it_be(:public_deploy_key) { create(:another_deploy_key, title: 'public_deploy_key', public: true) } diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index 28a238a5423..0fd153f0518 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -25,6 +25,20 @@ describe 'Projects > Settings > Repository settings' do context 'for maintainer' do let(:role) { :maintainer } + context 'Deploy tokens' do + let!(:deploy_token) { create(:deploy_token, projects: [project]) } + + before do + stub_container_registry_config(enabled: true) + stub_feature_flags(ajax_new_deploy_token: { enabled: false, thing: project }) + visit project_settings_repository_path(project) + end + + it_behaves_like 'a deploy token in settings' do + let(:entity_type) { 'project' } + end + end + context 'remote mirror settings' do before do visit project_settings_repository_path(project) diff --git a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb index 11b06604f27..a77240c5c33 100644 --- a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb +++ b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb @@ -12,7 +12,7 @@ describe 'Repository Settings > User sees revoke deploy token modal', :js do project.add_role(user, role) sign_in(user) stub_feature_flags(ajax_new_deploy_token: { enabled: false, thing: project }) - visit(project_settings_ci_cd_path(project)) + visit(project_settings_repository_path(project)) click_link('Revoke') end |