Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/models/timelog_spec.rb b/spec/models/timelog_spec.rb
index d6c31307e30..f96d02e6a82 100644
--- a/spec/models/timelog_spec.rb
+++ b/spec/models/timelog_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Timelog do
 
   it { expect(subject.project_id).not_to be_nil }
 
-  describe 'Issuable validation' do
+  describe 'validation' do
     it 'is invalid if issue_id and merge_request_id are missing' do
       subject.attributes = { issue: nil, merge_request: nil }
 
@@ -139,4 +139,14 @@ RSpec.describe Timelog do
       time + 1.day
     end
   end
+
+  describe 'hooks' do
+    describe '.set_project' do
+      it 'populates project with issuable project' do
+        timelog = create(:issue_timelog, issue: issue)
+
+        expect(timelog.project_id).to be(timelog.issue.project_id)
+      end
+    end
+  end
 end