Merge pull request #4 from programble/fix-initial

Fix apply command with empty journal & test
programble · Sep 21, 2015 · 4d870b8 · 4d870b8
2 parents 34c82cb + db069f6
commit 4d870b8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/lib/command/apply.ts b/lib/command/apply.ts
@@ -54,7 +54,7 @@ export default function apply(config: Config) {
 
   let previousEntry = journal.then(es => R.last(es));
   let newEntries = Promise.join(previousEntry, apply, (prev, es) =>
-    R.filter(e => e.timestamp > prev.timestamp, es)
+    prev ? R.filter(e => e.timestamp > prev.timestamp, es) : apply
   );
 
   return newEntries

diff --git a/test/command/apply.ts b/test/command/apply.ts
@@ -284,4 +284,31 @@ describe('Command apply', () => {
       assert.equal(formatSpy.callCount, 1)
     );
   });
+
+  describe('with empty journal', () => {
+    before(resetSpies);
+
+    before(() => {
+      readJournalStub.restore();
+      readJournalStub = sinon.stub(runner, 'readJournal', () =>
+        Promise.resolve([])
+      );
+
+      applyAllStub.restore();
+      applyAllStub = sinon.stub(
+        runner,
+        'applyAll',
+        (n: string, c: Config, j: string, ms: files.Migration[]) =>
+          Promise.resolve(R.map(migrationToEntry, ms))
+      );
+    });
+
+    it('succeeds', () =>
+      apply(loadObject({commands: {apply: {pending: true}}}))
+    );
+
+    it('calls formatJournalEntry for new entries', () =>
+      assert.equal(formatSpy.callCount, 3)
+    );
+  });
 });