diff options
author | Nick Thomas <nick@gitlab.com> | 2018-02-26 13:16:10 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-02-26 13:16:10 +0000 |
commit | ce6974eb1f7e8b3061ccffb5c4e6e98c9d26ab2c (patch) | |
tree | 5f62934d4e275aaf4741ac507c8f40ba4a5c35b4 | |
parent | a03b429c3e7c52f23009a52e2085d7e7e48a3207 (diff) | |
parent | 566be168cff435f088d45baf1c6934bff4bb493f (diff) | |
download | gitlab-ce-ce6974eb1f7e8b3061ccffb5c4e6e98c9d26ab2c.tar.gz |
Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master'
Get rid of hard-coded user/project/group names that could clash with DB sequences
See merge request gitlab-org/gitlab-ce!17290
-rw-r--r-- | spec/features/projects_spec.rb | 8 | ||||
-rw-r--r-- | spec/requests/openid_connect_spec.rb | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 645d12da09f..cfe979a8647 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -146,8 +146,8 @@ feature 'Project' do end describe 'removal', :js do - let(:user) { create(:user, username: 'test', name: 'test') } - let(:project) { create(:project, namespace: user.namespace, name: 'project1') } + let(:user) { create(:user) } + let(:project) { create(:project, namespace: user.namespace) } before do sign_in(user) @@ -156,8 +156,8 @@ feature 'Project' do end it 'removes a project' do - expect { remove_with_confirm('Remove project', project.path) }.to change {Project.count}.by(-1) - expect(page).to have_content "Project 'test / project1' is in the process of being deleted." + expect { remove_with_confirm('Remove project', project.path) }.to change { Project.count }.by(-1) + expect(page).to have_content "Project '#{project.full_name}' is in the process of being deleted." expect(Project.all.count).to be_zero expect(project.issues).to be_empty expect(project.merge_requests).to be_empty diff --git a/spec/requests/openid_connect_spec.rb b/spec/requests/openid_connect_spec.rb index de829011e58..6bed8e812c0 100644 --- a/spec/requests/openid_connect_spec.rb +++ b/spec/requests/openid_connect_spec.rb @@ -68,10 +68,10 @@ describe 'OpenID Connect requests' do let!(:public_email) { build :email, email: 'public@example.com' } let!(:private_email) { build :email, email: 'private@example.com' } - let!(:group1) { create :group, path: 'group1' } - let!(:group2) { create :group, path: 'group2' } - let!(:group3) { create :group, path: 'group3', parent: group2 } - let!(:group4) { create :group, path: 'group4', parent: group3 } + let!(:group1) { create :group } + let!(:group2) { create :group } + let!(:group3) { create :group, parent: group2 } + let!(:group4) { create :group, parent: group3 } before do group1.add_user(user, GroupMember::OWNER) @@ -93,8 +93,8 @@ describe 'OpenID Connect requests' do 'groups' => anything })) - expected_groups = %w[group1 group2/group3] - expected_groups << 'group2/group3/group4' if Group.supports_nested_groups? + expected_groups = [group1.full_path, group3.full_path] + expected_groups << group4.full_path if Group.supports_nested_groups? expect(json_response['groups']).to match_array(expected_groups) end end |