From e710a210fdb82a31e3a7ecf7debbdb4fb8109c9d Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 7 Feb 2018 21:19:05 +0100 Subject: [PATCH] Fixup the unit tests --- src/routes/test/oauth2-test.js | 12 ++++-------- src/test/database-test.js | 3 --- src/test/reverseproxy-test.js | 36 ---------------------------------- 3 files changed, 4 insertions(+), 47 deletions(-) diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js index 150981db8..37e8bb4e0 100644 --- a/src/routes/test/oauth2-test.js +++ b/src/routes/test/oauth2-test.js @@ -167,8 +167,7 @@ describe('OAuth2', function () { domain: DOMAIN_0.domain, portBindings: {}, accessRestriction: null, - memoryLimit: 0, - altDomain: null + memoryLimit: 0 }; var APP_1 = { @@ -179,8 +178,7 @@ describe('OAuth2', function () { domain: DOMAIN_0.domain, portBindings: {}, accessRestriction: { users: [ 'foobar' ] }, - memoryLimit: 0, - altDomain: null + memoryLimit: 0 }; var APP_2 = { @@ -191,8 +189,7 @@ describe('OAuth2', function () { domain: DOMAIN_0.domain, portBindings: {}, accessRestriction: { users: [ USER_0.id ] }, - memoryLimit: 0, - altDomain: null + memoryLimit: 0 }; var APP_3 = { @@ -203,8 +200,7 @@ describe('OAuth2', function () { domain: DOMAIN_0.domain, portBindings: {}, accessRestriction: { groups: [ 'someothergroup', 'admin', 'anothergroup' ] }, - memoryLimit: 0, - altDomain: null + memoryLimit: 0 }; // unknown app diff --git a/src/test/database-test.js b/src/test/database-test.js index 38b239e64..0b66c1ac5 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -210,7 +210,6 @@ describe('database', function () { oldConfig: null, newConfig: null, memoryLimit: 4294967296, - altDomain: null, xFrameOptions: 'DENY', sso: true, debugMode: null, @@ -716,7 +715,6 @@ describe('database', function () { oldConfig: null, updateConfig: null, memoryLimit: 4294967296, - altDomain: null, xFrameOptions: 'DENY', sso: true, debugMode: null, @@ -743,7 +741,6 @@ describe('database', function () { oldConfig: null, updateConfig: null, memoryLimit: 0, - altDomain: null, xFrameOptions: 'SAMEORIGIN', sso: true, debugMode: null, diff --git a/src/test/reverseproxy-test.js b/src/test/reverseproxy-test.js index d10d05174..afcf8906c 100644 --- a/src/test/reverseproxy-test.js +++ b/src/test/reverseproxy-test.js @@ -133,24 +133,6 @@ describe('Certificates', function () { done(); }); }); - - it('returns prod-acme with altDomain in prod cloudron', function (done) { - reverseProxy._getApi({ domain: DOMAIN_0.domain, altDomain: 'foo.something.com' }, function (error, api, options) { - expect(error).to.be(null); - expect(api._name).to.be('acme'); - expect(options.prod).to.be(true); - done(); - }); - }); - - it('returns prod acme with altDomain in dev cloudron', function (done) { - reverseProxy._getApi({ domain: DOMAIN_0.domain, altDomain: 'foo.something.com' }, function (error, api, options) { - expect(error).to.be(null); - expect(api._name).to.be('acme'); - expect(options.prod).to.be(true); - done(); - }); - }); }); describe('getApi - letsencrypt-prod', function () { @@ -174,15 +156,6 @@ describe('Certificates', function () { }); }); - it('returns prod acme with altDomain in prod cloudron', function (done) { - reverseProxy._getApi({ domain: DOMAIN_0.domain, altDomain: 'foo.bar.com' }, function (error, api, options) { - expect(error).to.be(null); - expect(api._name).to.be('acme'); - expect(options.prod).to.be(true); - done(); - }); - }); - it('returns prod acme in dev cloudron', function (done) { reverseProxy._getApi({ domain: DOMAIN_0.domain }, function (error, api, options) { expect(error).to.be(null); @@ -222,14 +195,5 @@ describe('Certificates', function () { done(); }); }); - - it('returns staging acme with altDomain in prod cloudron', function (done) { - reverseProxy._getApi({ domain: DOMAIN_0.domain, altDomain: 'foo.bar.com' }, function (error, api, options) { - expect(error).to.be(null); - expect(api._name).to.be('acme'); - expect(options.prod).to.be(false); - done(); - }); - }); }); });