Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/qa/spec/resource/user_spec.rb b/qa/spec/resource/user_spec.rb
index d612dfc530e..5845f7996a3 100644
--- a/qa/spec/resource/user_spec.rb
+++ b/qa/spec/resource/user_spec.rb
@@ -35,8 +35,8 @@ describe QA::Resource::User do
   end
 
   describe '#name' do
-    it 'defaults to the username' do
-      expect(subject.name).to eq(subject.username)
+    it 'defaults to a name based on the username' do
+      expect(subject.name).to match(/#{subject.username.tr('-', ' ')}/i)
     end
 
     it 'retrieves the name from the api_resource if present' do