From b1ffc665fbf9d8f371f539daac8dfd803fc4d502 Mon Sep 17 00:00:00 2001
From: John Roesler <johnrroesler@gmail.com>
Date: Fri, 2 Feb 2024 09:46:08 -0600
Subject: [PATCH] fix RunNow() when calling from a job returned by Jobs()
 (#668)

---
 scheduler.go      | 9 +++++----
 scheduler_test.go | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/scheduler.go b/scheduler.go
index c2bc53d3..32c7acc7 100644
--- a/scheduler.go
+++ b/scheduler.go
@@ -454,10 +454,11 @@ func (s *scheduler) now() time.Time {
 
 func (s *scheduler) jobFromInternalJob(in internalJob) job {
 	return job{
-		id:            in.id,
-		name:          in.name,
-		tags:          slices.Clone(in.tags),
-		jobOutRequest: s.jobOutRequestCh,
+		in.id,
+		in.name,
+		slices.Clone(in.tags),
+		s.jobOutRequestCh,
+		s.runJobRequestCh,
 	}
 }
 
diff --git a/scheduler_test.go b/scheduler_test.go
index 565939be..b7c05ca5 100644
--- a/scheduler_test.go
+++ b/scheduler_test.go
@@ -1479,7 +1479,7 @@ func TestScheduler_RunJobNow(t *testing.T) {
 		{
 			"duration job - start immediately",
 			chDurationImmediate,
-			DurationJob(time.Second * 10),
+			DurationJob(time.Second * 5),
 			func() {
 				chDurationImmediate <- struct{}{}
 			},
@@ -1489,7 +1489,7 @@ func TestScheduler_RunJobNow(t *testing.T) {
 				),
 			},
 			func() time.Duration {
-				return 10 * time.Second
+				return 5 * time.Second
 			},
 			2,
 		},
@@ -1529,9 +1529,10 @@ func TestScheduler_RunJobNow(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			s := newTestScheduler(t)
 
-			j, err := s.NewJob(tt.j, NewTask(tt.fun), tt.opts...)
+			_, err := s.NewJob(tt.j, NewTask(tt.fun), tt.opts...)
 			require.NoError(t, err)
 
+			j := s.Jobs()[0]
 			s.Start()
 
 			var nextRunBefore time.Time
@@ -1567,6 +1568,7 @@ func TestScheduler_RunJobNow(t *testing.T) {
 			nextRunAfter, err := j.NextRun()
 			if tt.expectedDiff != nil && tt.expectedDiff() > 0 {
 				for ; nextRunBefore.IsZero() || nextRunAfter.Equal(nextRunBefore); nextRunAfter, err = j.NextRun() { //nolint:revive
+					time.Sleep(100 * time.Millisecond)
 				}
 			}