apostrophe 3.14.2 → 3.16.0

package/test/pieces.js

@@ -1280,4 +1280,122 @@ describe('Pieces', function() {
     assert(existingPiece.title === 'new product name');
     assert(existingPiece.color === 'red');
   });
+
+  it('should not set a cache-control value when retrieving pieces, when cache option is not set', async () => {
+    const response1 = await apos.http.get('/api/v1/thing', { fullResponse: true });
+    const response2 = await apos.http.get('/api/v1/thing/testThing:en:published', { fullResponse: true });
+
+    assert(response1.headers['cache-control'] === undefined);
+    assert(response2.headers['cache-control'] === undefined);
+  });
+
+  it('should not set a cache-control value when retrieving pieces, when "api" cache option is not set', async () => {
+    apos.thing.options.cache = {
+      page: {
+        maxAge: 5555
+      }
+    };
+
+    const response1 = await apos.http.get('/api/v1/thing', { fullResponse: true });
+    const response2 = await apos.http.get('/api/v1/thing/testThing:en:published', { fullResponse: true });
+
+    assert(response1.headers['cache-control'] === undefined);
+    assert(response2.headers['cache-control'] === undefined);
+
+    delete apos.thing.options.cache;
+  });
+
+  it('should set a "max-age" cache-control value when retrieving pieces, when "api" cache option is set', async () => {
+    apos.thing.options.cache = {
+      api: {
+        maxAge: 3333
+      }
+    };
+
+    const response1 = await apos.http.get('/api/v1/thing', { fullResponse: true });
+    const response2 = await apos.http.get('/api/v1/thing/testThing:en:published', { fullResponse: true });
+
+    assert(response1.headers['cache-control'] === 'max-age=3333');
+    assert(response2.headers['cache-control'] === 'max-age=3333');
+
+    delete apos.thing.options.cache;
+  });
+
+  it('should set a "no-store" cache-control value when retrieving pieces, when user is connected', async () => {
+    await apos.http.post('/api/v1/@apostrophecms/login/login', {
+      body: {
+        username: 'admin',
+        password: 'admin',
+        session: true
+      },
+      jar
+    });
+
+    const response1 = await apos.http.get('/api/v1/thing', {
+      fullResponse: true,
+      jar
+    });
+    const response2 = await apos.http.get('/api/v1/thing/testThing:en:published', {
+      fullResponse: true,
+      jar
+    });
+
+    assert(response1.headers['cache-control'] === 'no-store');
+    assert(response2.headers['cache-control'] === 'no-store');
+  });
+
+  it('should set a "no-store" cache-control value when retrieving pieces, when "api" cache option is set, when user is connected', async () => {
+    apos.thing.options.cache = {
+      api: {
+        maxAge: 3333
+      }
+    };
+
+    await apos.http.post('/api/v1/@apostrophecms/login/login', {
+      body: {
+        username: 'admin',
+        password: 'admin',
+        session: true
+      },
+      jar
+    });
+
+    const response1 = await apos.http.get('/api/v1/thing', {
+      fullResponse: true,
+      jar
+    });
+    const response2 = await apos.http.get('/api/v1/thing/testThing:en:published', {
+      fullResponse: true,
+      jar
+    });
+
+    assert(response1.headers['cache-control'] === 'no-store');
+    assert(response2.headers['cache-control'] === 'no-store');
+
+    delete apos.thing.options.cache;
+  });
+
+  it('should set a "no-store" cache-control value when retrieving pieces, when user is connected using an api key', async () => {
+    const response1 = await apos.http.get(`/api/v1/thing?apiKey=${apiKey}`, { fullResponse: true });
+    const response2 = await apos.http.get(`/api/v1/thing/testThing:en:published?apiKey=${apiKey}`, { fullResponse: true });
+
+    assert(response1.headers['cache-control'] === 'no-store');
+    assert(response2.headers['cache-control'] === 'no-store');
+  });
+
+  it('should set a "no-store" cache-control value when retrieving pieces, when "api" cache option is set, when user is connected using an api key', async () => {
+    apos.thing.options.cache = {
+      api: {
+        maxAge: 3333
+      }
+    };
+
+    const response1 = await apos.http.get(`/api/v1/thing?apiKey=${apiKey}`, { fullResponse: true });
+    const response2 = await apos.http.get(`/api/v1/thing/testThing:en:published?apiKey=${apiKey}`, { fullResponse: true });
+
+    assert(response1.headers['cache-control'] === 'no-store');
+    assert(response2.headers['cache-control'] === 'no-store');
+
+    delete apos.thing.options.cache;
+  });
 });

package/test/templates.js

@@ -115,6 +115,7 @@ describe('Templates', function() {
     assert($body.length);
     const aposData = JSON.parse($body.attr('data-apos'));
     assert(aposData);
+    assert(aposData.shortName);
     assert(aposData.csrfCookieName);
     assert(!aposData.modules['@apostrophecms/admin-bar']);
     assert(result.indexOf('<title>I am the title</title>') !== -1);
@@ -129,6 +130,7 @@ describe('Templates', function() {
     assert($body.length);
     const aposData = JSON.parse($body.attr('data-apos'));
     assert(aposData);
+    assert(aposData.shortName);
     assert(aposData.modules['@apostrophecms/admin-bar'].items.length);
     assert(result.indexOf('<title>I am the title</title>') !== -1);
     assert(result.indexOf('<h2>I am the main content</h2>') !== -1);