add custom domain test

appstore.js

@@ -54,6 +54,28 @@ AppStore.prototype.getCloudron = function (boxId) {
     return res.body.box;
 };
 
+AppStore.prototype.waitForIP = function (boxId) {
+    process.stdout.write('Waiting for cloudron to get an IP.');
+
+    var res;
+
+    while (true) {
+        sleep(10);
+        process.stdout.write('.');
+        res = request.get(this._origin + '/api/v1/cloudrons/' + boxId).query({ accessToken: this._credentials.accessToken }).end();
+        common.verifyResponse(res, 'Could not query cloudron status');
+
+        if (res.body.box.ip) {
+            debug();
+            break;
+        }
+    }
+
+    debug('Box IP:%s'.green, res.body.box.ip);
+
+    return res.body.box.ip;
+};
+
 AppStore.prototype.waitForCloudron = function (boxId) {
     var creationTime = new Date();
     process.stdout.write('Waiting for cloudron to come up.');

cloudron.js

@@ -18,7 +18,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
 function Cloudron(box) {
     this._box = box;
-    this._origin = 'https://my-' + box.domain;
+    this._origin = box.domain === process.env.CUSTOM_DOMAIN ? 'https://my.' + box.domain : 'https://my-' + box.domain;
 
     this._credentials = {
         password: null,
@@ -103,6 +103,8 @@ Cloudron.prototype.waitForApp = function (appId) {
     }
     assert.strictEqual(res.body.installationState, 'installed');
     assert.strictEqual(res.body.runState, 'running');
+
+    return res.body;
 };
 
 
@@ -138,10 +140,10 @@ Cloudron.prototype.installApp = function (location, manifest, cloudronVersion) {
     debug('App installed at %s'.green, location);
     var appId = res.body.id;
 
-    this.waitForApp(appId);
+    var app = this.waitForApp(appId);
     debug('App is running'.green);
 
-    res = request.get('https://' + location + '-' + this._box.domain).end();
+    res = request.get('https://' + app.fqdn).end();
     common.verifyResponse2(res, 'App is unreachable');
     console.log('App is reachable'.green);
 
@@ -153,9 +155,9 @@ Cloudron.prototype.configureApp = function (appId, newLocation) {
     common.verifyResponse2(res, 'App could not be configured');
 
     console.log('App moved to different location'.green);
-    this.waitForApp(appId);
+    var app = this.waitForApp(appId);
 
-    res = request.get('https://' + newLocation + '-' + this._box.domain).end();
+    res = request.get('https://' + app.fqdn).end();
     common.verifyResponse2(res, 'App is unreachable');
     console.log('App is reachable'.green);
 };

test/custom-domain-test.js

@@ -0,0 +1,126 @@
+#!/usr/bin/env node
+
+/*
+ * This tests a flow for cloudron owner creating a cloudron
+ * with a custom domain from the appstore. Owner creates a cloudron, activates
+ * it, installs and app and deletes the cloudron eventually
+ */
+
+'use strict';
+
+var AppStore = require('../appstore.js'),
+    async = require('async'),
+    Cloudron = require('../cloudron.js'),
+    common = require('../common.js'),
+    dns = require('dns');
+
+require('colors');
+
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+var BOX_VERSION = process.env.BOX_VERSION;
+var CUSTOM_DOMAIN = process.env.CUSTOM_DOMAIN;
+
+describe('Appstore new user flow', function () {
+    this.timeout(0);
+
+    var appStore = new AppStore('https://api.staging.cloudron.io');
+
+    var owner = common.getOwner();
+    var admin = common.getAdmin();
+    var cloudron, appId, box;
+
+    it('can login to the store', function () {
+        var accessToken = appStore.getAccessToken(owner);
+        appStore.setCredentials(owner.password, accessToken);
+
+        var adminAccessToken = appStore.getAccessToken(admin);
+        appStore.setCredentials(admin.password, adminAccessToken);
+    });
+
+    it('can get profile', function () {
+        var profile = appStore.getProfile();
+        owner.id = profile.id;
+    });
+
+    it('can setup billing details', function (done) {
+        appStore.setupBilling(owner, done);
+    });
+
+    it('can create a cloudron', function () {
+        box = appStore.createCloudron({
+            domain: CUSTOM_DOMAIN,
+            region: 'sfo1',
+            size: '512mb',
+            version: BOX_VERSION
+        });
+    });
+
+    it('can setup my. domain after it got IP', function () {
+        var ip = appStore.waitForIP(box.id);
+    });
+
+    it('can wait for cloudron', function () {
+        box = appStore.waitForCloudron(box.id);
+        cloudron = new Cloudron(box);
+    });
+
+    it('can activate the box', function () {
+        cloudron.activate(owner);
+    });
+
+    it('can login to the box', function () {
+        var token = cloudron.getOauthToken(owner);
+        cloudron.setCredentials(owner.password, token);
+    });
+
+    var location = 'haste' + (Math.random() * 10000).toFixed();
+    it('can install app', function () {
+        var manifest = appStore.getManifest('com.hastebin.cloudronapp', '0.1.1');
+        appId = cloudron.installApp(location, manifest);
+    });
+
+    it('can configure app', function () {
+        location = location + 'x';
+        cloudron.configureApp(appId, location);
+    });
+
+    it('can uninstall app', function () {
+        cloudron.uninstallApp(appId);
+    });
+
+    // check this after activation
+    it('has setup DNS records correctly', function (done) {
+        async.series([
+            cloudron.checkA.bind(cloudron),
+            cloudron.checkSPF.bind(cloudron),
+            cloudron.checkDKIM.bind(cloudron),
+            cloudron.checkDMARC.bind(cloudron)
+        ], done);
+    });
+
+    it('can delete the cloudron', function () {
+        appStore.deleteCloudron(box);
+    });
+
+    xit('has setup DNS records cleaned up', function (done) {
+        dns.setServers([ '205.251.199.12' ]); // use different dns server so as to not get cached results
+
+        function expectError(tag, fn) {
+            return function (cb) {
+                fn(function (error, records) {
+                    if (!error) console.error('Records of %s is %j', tag, records);
+
+                    cb(error ? null : new Error('Expecting error for ' + tag));
+                });
+            };
+        }
+
+        async.series([
+            expectError('checkA', cloudron.checkA.bind(cloudron)),
+            expectError('checkSPF', cloudron.checkSPF.bind(cloudron)),
+            expectError('checkDKIM', cloudron.checkDKIM.bind(cloudron)),
+            expectError('checkDMARC', cloudron.checkDMARC.bind(cloudron))
+        ], done);
+    });
+
+});