fix: only query previously published items if saving is enabled

getindiekit · Sep 6, 2020 · 902d452 · 902d452
1 parent c3994dd
commit 902d452
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
   },
   "ava": {
     "environmentVariables": {
-      "MONGODB_URL": "mongodb://localhost:27017/test",
+      "TEST_MONGODB_URL": "mongodb://localhost:27017/test",
       "NODE_ENV": "test"
     },
     "verbose": true

diff --git a/packages/endpoint-media/controllers/query.js b/packages/endpoint-media/controllers/query.js
@@ -22,10 +22,9 @@ export const queryController = publication => {
       switch (query.q) {
         case 'source': {
           // Return previously uploaded media
-          const items = await publication.media
-            .find()
-            .map(media => media.properties)
-            .toArray();
+          const items = publication.media ?
+            await publication.media.find().map(media => media.properties).toArray() :
+            [];
           return response.json({
             items: queryList(items, {filter, limit, offset})
           });

diff --git a/packages/endpoint-micropub/controllers/query.js b/packages/endpoint-micropub/controllers/query.js
@@ -41,10 +41,9 @@ export const queryController = publication => {
           }
 
           // Return microformats for previously published posts
-          const items = await publication.posts
-            .find()
-            .map(post => post.mf2)
-            .toArray();
+          const items = publication.posts ?
+            await publication.posts.find().map(post => post.mf2).toArray() :
+            [];
           return response.json({
             items: queryList(items, {filter, limit, offset})
           });

diff --git a/packages/indiekit/tests/lib/cache.js b/packages/indiekit/tests/lib/cache.js
@@ -4,7 +4,7 @@ import {mongodbConfig} from '../../config/mongodb.js';
 import {Cache} from '../../lib/cache.js';
 
 test.beforeEach(async t => {
-  const database = await mongodbConfig;
+  const database = await mongodbConfig(process.env.TEST_MONGODB_URL);
   const collection = await database.collection('cache');
 
   t.context = {
@@ -15,7 +15,7 @@ test.beforeEach(async t => {
 });
 
 test.afterEach.always(async () => {
-  const database = await mongodbConfig;
+  const database = await mongodbConfig(process.env.TEST_MONGODB_URL);
   await database.dropDatabase();
 });
 

diff --git a/packages/indiekit/tests/lib/publication.js b/packages/indiekit/tests/lib/publication.js
@@ -11,7 +11,7 @@ import {
 } from '../../lib/publication.js';
 
 test.beforeEach(async t => {
-  const database = await mongodbConfig;
+  const database = await mongodbConfig(process.env.TEST_MONGODB_URL);
   const collection = await database.collection('cache');
 
   t.context = await {
@@ -28,7 +28,7 @@ test.beforeEach(async t => {
 });
 
 test.afterEach.always(async () => {
-  const database = await mongodbConfig;
+  const database = await mongodbConfig(process.env.TEST_MONGODB_URL);
   await database.dropDatabase();
 });