Merge branch 'next' into eliminate-duplicate-nginx-dockerfile

getodk · Oct 7, 2024 · bdf3d28 · bdf3d28
2 parents fdba963 + 87bbdb3
commit bdf3d28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test-nginx.yml
@@ -21,8 +21,8 @@ jobs:
     - run: cd test && ./run-tests.sh
 
     - if: always()
-      run: docker logs test-nginx-1
+      run: docker logs test-nginx-1 || true
     - if: always()
-      run: docker logs test-service-1
+      run: docker logs test-service-1 || true
     - if: always()
-      run: docker logs test-enketo-1
+      run: docker logs test-enketo-1 || true
diff --git a/test/test-nginx.js b/test/test-nginx.js
@@ -11,7 +11,6 @@ describe('nginx config', () => {
     const res = await fetchHttp('/.well-known/acme-challenge');
 
     // then
-    assert.isFalse(res.ok);
     assert.equal(res.status, 301);
     assert.equal(res.headers.get('location'), 'https://localhost:9000/.well-known/acme-challenge');
   });
@@ -21,7 +20,6 @@ describe('nginx config', () => {
     const res = await fetchHttps('/.well-known/acme-challenge');
 
     // then
-    assert.isFalse(res.ok);
     assert.equal(res.status, 404);
   });
 
@@ -30,7 +28,6 @@ describe('nginx config', () => {
     const res = await fetchHttp('/');
 
     // then
-    assert.isFalse(res.ok);
     assert.equal(res.status, 301);
     assert.equal(res.headers.get('location'), 'https://localhost:9000/');
   });
@@ -40,7 +37,6 @@ describe('nginx config', () => {
     const res = await fetchHttps('/client-config.json');
 
     // then
-    assert.isTrue(res.ok);
     assert.equal(res.status, 200);
     assert.deepEqual(await res.json(), { oidcEnabled: false });
     assert.equal(await res.headers.get('cache-control'), 'no-cache');
@@ -55,7 +51,6 @@ describe('nginx config', () => {
       const res = await fetchHttps(staticFile);
 
       // then
-      assert.isTrue(res.ok);
       assert.equal(res.status, 200);
       assert.match(await res.text(), expectedContent);
       assert.equal(await res.headers.get('cache-control'), 'no-cache');
@@ -72,7 +67,6 @@ describe('nginx config', () => {
       const res = await fetchHttps(staticFile);
 
       // then
-      assert.isTrue(res.ok);
       assert.equal(res.status, 200);
       assert.isNull(await res.headers.get('cache-control'));
     });
@@ -83,7 +77,6 @@ describe('nginx config', () => {
     const res = await fetchHttps('/-/some/enketo/path');
 
     // then
-    assert.isTrue(res.ok);
     assert.equal(res.status, 200);
     assert.equal(await res.text(), 'OK');
     // and
@@ -97,7 +90,6 @@ describe('nginx config', () => {
     const res = await fetchHttps('/v1/some/central-backend/path');
 
     // then
-    assert.isTrue(res.ok);
     assert.equal(res.status, 200);
     assert.equal(await res.text(), 'OK');
     // and