jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove use of isCustomDomain

Browse Source 
Use adminFqdn instead as needed
This commit is contained in:
Girish Ramakrishnan
2018-01-10 20:40:15 -08:00
parent aeb883623b
commit 915cfbe7dd
14 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/config-test.js
View File

@@ -31,8 +31,8 @@ describe('config', function () {
});
it('did set default values', function () {
expect(config.isCustomDomain()).to.equal(true);
expect(config.fqdn()).to.equal('');
expect(config.adminFqdn()).to.equal('');
expect(config.zoneName()).to.equal('');
expect(config.adminLocation()).to.equal('my');
});
@@ -63,20 +63,20 @@ describe('config', function () {
it('uses dotted locations with custom domain', function () {
config.setFqdn('example.com');
config.set('isCustomDomain', true);
config.setAdminFqdn('my.example.com');
expect(config.isCustomDomain()).to.equal(true);
expect(config.fqdn()).to.equal('example.com');
expect(config.adminFqdn()).to.equal('my.example.com');
expect(config.adminOrigin()).to.equal('https://my.example.com');
expect(config.zoneName()).to.equal('example.com');
});
it('uses hyphen locations with non-custom domain', function () {
config.setFqdn('test.example.com');
config.set('isCustomDomain', false);
config.setAdminFqdn('my-test.example.com');
expect(config.isCustomDomain()).to.equal(false);
expect(config.fqdn()).to.equal('test.example.com');
expect(config.adminLocation()).to.equal('my');
expect(config.adminOrigin()).to.equal('https://my-test.example.com');
expect(config.zoneName()).to.equal('example.com');
});