2 files changed, 32 insertions, 3 deletions
diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb
index 492b55cdece..313f87ae1f6 100644
--- a/spec/services/merge_requests/create_from_issue_service_spec.rb
+++ b/spec/services/merge_requests/create_from_issue_service_spec.rb
@@ -2,8 +2,10 @@ require 'spec_helper'
 
 describe MergeRequests::CreateFromIssueService do
   let(:project) { create(:project, :repository) }
-  let(:user)    { create(:user) }
-  let(:issue)   { create(:issue, project: project) }
+  let(:user) { create(:user) }
+  let(:label_ids) { create_pair(:label, project: project).map(&:id) }
+  let(:milestone_id) { create(:milestone, project: project).id }
+  let(:issue) { create(:issue, project: project, milestone_id: milestone_id) }
 
   subject(:service) { described_class.new(project, user, issue_iid: issue.iid) }
 
@@ -25,6 +27,20 @@ describe MergeRequests::CreateFromIssueService do
       described_class.new(project, user, issue_iid: -1).execute
     end
 
+    it "inherits labels" do
+      issue.assign_attributes(label_ids: label_ids)
+
+      result = service.execute
+
+      expect(result[:merge_request].label_ids).to eq(label_ids)
+    end
+
+    it "inherits milestones" do
+      result = service.execute
+
+      expect(result[:merge_request].milestone_id).to eq(milestone_id)
+    end
+
     it 'delegates the branch creation to CreateBranchService' do
       expect_any_instance_of(CreateBranchService).to receive(:execute).once.and_call_original
 
diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index 343804e3de0..985f6d94876 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -12,9 +12,22 @@ describe Users::UpdateService do
     end
 
     it 'returns an error result when record cannot be updated' do
+      result = {}
       expect do
-        update_user(user, { email: 'invalid' })
+        result = update_user(user, { email: 'invalid' })
       end.not_to change { user.reload.email }
+      expect(result[:status]).to eq(:error)
+      expect(result[:message]).to eq('Email is invalid')
+    end
+
+    it 'includes namespace error messages' do
+      create(:group, name: 'taken', path: 'something_else')
+      result = {}
+      expect do
+        result = update_user(user, { username: 'taken' })
+      end.not_to change { user.reload.username }
+      expect(result[:status]).to eq(:error)
+      expect(result[:message]).to eq('Namespace name has already been taken')
     end
 
     def update_user(user, opts)