diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:51:19 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:51:19 +0300 |
commit | 2dbcb9cb37990c43c2065b3ff26b6564d43cac4c (patch) | |
tree | 9877dd35f9557cdeebca9eaf2097190c3c6a6df0 /spec | |
parent | c93dc12594aa550e17c485222d841b6d8f476204 (diff) | |
parent | 561d327527799342c6b0e9f6a15f7eefb9ffe41c (diff) |
Merge branch 'dm-internal-user-namespace' into 'master'
Ensure internal users (ghost, support bot) get assigned a namespace
See merge request gitlab-org/gitlab-ce!18194
Diffstat (limited to 'spec')
-rw-r--r-- | spec/migrations/rename_users_with_renamed_namespace_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/migrations/rename_users_with_renamed_namespace_spec.rb b/spec/migrations/rename_users_with_renamed_namespace_spec.rb index cbc0ebeb44d..e2994103ed7 100644 --- a/spec/migrations/rename_users_with_renamed_namespace_spec.rb +++ b/spec/migrations/rename_users_with_renamed_namespace_spec.rb @@ -7,9 +7,9 @@ describe RenameUsersWithRenamedNamespace, :delete do other_user1 = create(:user, username: 'api0') user = create(:user, username: "Users0") - user.update_attribute(:username, 'Users') + user.update_column(:username, 'Users') user1 = create(:user, username: "import0") - user1.update_attribute(:username, 'import') + user1.update_column(:username, 'import') described_class.new.up diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4027c420e47..a600987d0bf 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2071,6 +2071,8 @@ describe User do expect(ghost).to be_ghost expect(ghost).to be_persisted + expect(ghost.namespace).not_to be_nil + expect(ghost.namespace).to be_persisted end it "does not create a second ghost user if one is already present" do |