Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/models/timelog_spec.rb b/spec/models/timelog_spec.rb
index 7321a458817..33c1afad59f 100644
--- a/spec/models/timelog_spec.rb
+++ b/spec/models/timelog_spec.rb
@@ -41,4 +41,30 @@ RSpec.describe Timelog do
       expect(subject).to be_valid
     end
   end
+
+  describe 'scopes' do
+    describe 'for_issues_in_group' do
+      it 'return timelogs created for group issues' do
+        group = create(:group)
+        subgroup = create(:group, parent: group)
+
+        create(:timelog, issue: create(:issue, project: create(:project)))
+        timelog1 = create(:timelog, issue: create(:issue, project: create(:project, group: group)))
+        timelog2 = create(:timelog, issue: create(:issue, project: create(:project, group: subgroup)))
+
+        expect(described_class.for_issues_in_group(group)).to contain_exactly(timelog1, timelog2)
+      end
+    end
+
+    describe 'between_dates' do
+      it 'returns collection of timelogs within given dates' do
+        create(:timelog, spent_at: 65.days.ago)
+        timelog1 = create(:timelog, spent_at: 15.days.ago)
+        timelog2 = create(:timelog, spent_at: 5.days.ago)
+        timelogs = described_class.between_dates(20.days.ago, 1.day.ago)
+
+        expect(timelogs).to contain_exactly(timelog1, timelog2)
+      end
+    end
+  end
 end