Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-12-13 12:22:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-12-13 12:22:56 +0300
commitd2d66de7163c42532c5a1c3cddebb144658c5242 (patch)
tree5c80bff8c43c76f3c5d1a7a24ae173f0742b5129 /spec/support
parent7ebc422d70a4737a3b5c1b7cf9d0d6e3e47c9890 (diff)
Add latest changes from gitlab-org/security/gitlab@16-6-stable-eev16.6.2
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/shared_examples/models/trackable_shared_examples.rb25
-rw-r--r--spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb2
2 files changed, 27 insertions, 0 deletions
diff --git a/spec/support/shared_examples/models/trackable_shared_examples.rb b/spec/support/shared_examples/models/trackable_shared_examples.rb
new file mode 100644
index 00000000000..649a8eb2d6c
--- /dev/null
+++ b/spec/support/shared_examples/models/trackable_shared_examples.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a time trackable' do
+ describe '#total_time_spent' do
+ context 'when total time spent exceeds the allowed limit' do
+ let(:time_spent) { Timelog::MAX_TOTAL_TIME_SPENT + 1.second }
+
+ it 'returns the maximum allowed total time spent' do
+ timelog.update_column(:time_spent, time_spent.to_i)
+
+ expect(trackable.total_time_spent).to eq(Timelog::MAX_TOTAL_TIME_SPENT)
+ end
+
+ context 'when total time spent is below 0' do
+ let(:time_spent) { -Timelog::MAX_TOTAL_TIME_SPENT - 1.second }
+
+ it 'returns the minimum allowed total time spent' do
+ timelog.update_column(:time_spent, time_spent.to_i)
+
+ expect(trackable.total_time_spent).to eq(-Timelog::MAX_TOTAL_TIME_SPENT)
+ end
+ end
+ end
+ end
+end
diff --git a/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb b/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb
index dec15cb68b3..eddda969ba2 100644
--- a/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb
@@ -169,6 +169,8 @@ RSpec.shared_examples 'time tracking endpoints' do |issuable_name|
end
it "resets spent time for #{issuable_name}" do
+ issuable.update!(spend_time: { duration: 60, user_id: user.id })
+
travel_to(2.minutes.from_now) do
expect do
post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/reset_spent_time", user)