Fixed skipImmediate option in .every

lib/agenda/every.js

@@ -25,7 +25,6 @@ module.exports = async function(interval, names, data, options) {
 
     job.attrs.type = 'single';
     job.repeatEvery(interval, options);
-    job.computeNextRunAt();
     await job.save();
 
     return job;

lib/job/repeat-every.js

@@ -16,6 +16,8 @@ module.exports = function(interval, options) {
     this.attrs.lastRunAt = new Date();
     this.computeNextRunAt();
     this.attrs.lastRunAt = undefined;
+  } else {
+    this.computeNextRunAt();
   }
   return this;
 };

test/agenda.js

@@ -248,6 +248,22 @@ describe('Agenda', () => {
           const res = await jobs.jobs({name: 'shouldBeSingleJob'});
           expect(res).to.have.length(1);
         });
+        it('should not run immediately if options.skipImmediate is true', async() => {
+          const jobName = 'send email';
+          await jobs.every('5 minutes', jobName, {}, {skipImmediate: true});
+          const job = (await jobs.jobs({name: jobName}))[0];
+          const nextRunAt = job.attrs.nextRunAt.getTime();
+          const now = new Date().getTime();
+          expect((nextRunAt - now) > 0).to.equal(true);
+        });
+        it('should run immediately if options.skipImmediate is false', async() => {
+          const jobName = 'send email';
+          await jobs.every('5 minutes', jobName, {}, {skipImmediate: false});
+          const job = (await jobs.jobs({name: jobName}))[0];
+          const nextRunAt = job.attrs.nextRunAt.getTime();
+          const now = new Date().getTime();
+          expect((nextRunAt - now) <= 0).to.equal(true);
+        });
       });
       describe('with array of names specified', () => {
         it('returns array of jobs', async() => {