diff --git a/CHANGELOG b/CHANGELOG
index 4d9699d..3c9ce5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,3 +28,17 @@
[0.2.7]
* Updated to 2017-06-13T19-01-01Z
+
+[0.3.0]
+* Update to 2017-07-24T18-27-35Z
+
+[1.0.0]
+* Update to 2017-08-05T00-00-53Z
+
+[1.1.0]
+* Update to 2017-09-29T19-16-56Z
+* This version requires at Cloudron v1.7.2
+
+[1.2.0]
+* Update to 2017-10-27T18-59-02Z
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 79a4faa..8d188d9 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
"description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG",
"tagline": "Distributed object storage",
- "version": "0.2.7",
+ "version": "1.2.0",
"healthCheckPath": "/minio/login",
"httpPort": 8000,
"addons": {
@@ -13,6 +13,7 @@
},
"manifestVersion": 1,
"website": "http://www.minio.io",
+ "minBoxVersion": "1.7.2",
"contactEmail": "support@cloudron.io",
"icon": "logo.png",
"tags": [
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 1d91926..1e08b54 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Minio 2017-06-13T19-01-01Z.
+This app packages Minio 2017-10-27T18-59-02Z.
Minio is a distributed object storage server built for cloud applications and devops.
diff --git a/Dockerfile b/Dockerfile
index 60fcdee..9657848 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Minio Developers
EXPOSE 8000
-ENV VERSION 2017-06-13T19-01-01Z
+ENV VERSION 2017-10-27T18-59-02Z
RUN mkdir -p /app/code \
&& wget https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.${VERSION} -O /app/code/minio \
diff --git a/test/test.js b/test/test.js
index 33b0931..57229a5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -13,9 +13,7 @@ var by = webdriver.By,
var accessKey = 'admin',
secretKey = 'secretkey';
-var bucket_prefix = 'bucket',
- bucket_id = 0,
- bucket;
+var bucket = 'cloudrontestbucket';
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -45,81 +43,100 @@ describe('Application life cycle test', function () {
var TEST_TIMEOUT = 10000;
var app;
- function pageLoaded(callback) {
- return browser.wait(until.elementLocated(by.className('page-load pl-0 pl-1')), TEST_TIMEOUT).then(function () {
- callback();
- });
+ function pageLoaded() {
+ return browser.wait(until.elementLocated(by.className('page-load pl-0 pl-1')), TEST_TIMEOUT);
}
- function visible(selector, callback) {
+ function visible(selector) {
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
- browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
- callback();
- });
+ return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
});
}
function login(callback) {
browser.manage().deleteAllCookies();
- browser.get('https://' + app.fqdn);
-
- visible(by.id('accessKey'), function () {
- browser.findElement(by.id('accessKey')).sendKeys(accessKey);
- browser.findElement(by.id('secretKey')).sendKeys(secretKey);
- browser.findElement(by.className('lw-btn')).click();
- browser.wait(until.elementLocated(by.id('top-right-menu')), TEST_TIMEOUT).then(function () { callback(); });
+ browser.get('https://' + app.fqdn).then(function () {
+ return visible(by.id('accessKey'));
+ }).then(function () {
+ return browser.findElement(by.id('accessKey')).sendKeys(accessKey);
+ }).then(function () {
+ return browser.findElement(by.id('secretKey')).sendKeys(secretKey);
+ }).then(function () {
+ return browser.findElement(by.className('lw-btn')).click();
+ }).then(function () {
+ return browser.wait(until.elementLocated(by.id('top-right-menu')), TEST_TIMEOUT);
+ }).then(function () {
+ callback();
});
}
function logout(callback) {
browser.get('https://' + app.fqdn);
- pageLoaded(function () {
- visible(by.id('top-right-menu'), function () {
- browser.findElement(by.id('top-right-menu')).click();
- visible(by.xpath('//*[text()="Sign Out "]'), function () {
- browser.findElement(by.xpath('//*[text()="Sign Out "]')).click();
-
- browser.wait(until.elementLocated(by.id('accessKey')), TEST_TIMEOUT).then(function () { callback(); });
- });
- });
+ pageLoaded().then(function () {
+ return visible(by.id('top-right-menu'));
+ }).then(function () {
+ return browser.findElement(by.id('top-right-menu')).click();
+ }).then(function () {
+ return visible(by.xpath('//*[text()="Sign Out "]'));
+ }).then(function () {
+ return browser.findElement(by.xpath('//*[text()="Sign Out "]')).click();
+ }).then(function () {
+ return browser.wait(until.elementLocated(by.id('accessKey')), TEST_TIMEOUT);
+ }).then(function () {
+ callback();
});
}
function addBucket(callback) {
- bucket_id = bucket_id + 1;
- bucket = bucket_prefix + bucket_id;
browser.get('https://' + app.fqdn);
- pageLoaded(function () {
- visible(by.className('fa fa-plus'), function () {
- browser.findElement(by.className('fa fa-plus')).click();
- visible(by.className('fa fa-hdd-o'), function () {
- browser.findElement(by.className('fa fa-hdd-o')).click();
- visible(by.xpath('//*[@class="modal-body"]/form/div/input'), function() {
- browser.findElement(by.xpath('//*[@class="modal-body"]/form/div/input')).sendKeys(bucket);
- browser.findElement(by.xpath('//*[@class="modal-body"]/form')).submit();
- visible(by.xpath('//*[@class="main"]/a[text()="' + bucket + '"]'), function() {
- callback();
- });
- });
- });
- });
+ pageLoaded().then(function () {
+ return visible(by.className('fa fa-plus'));
+ }).then(function () {
+ return browser.findElement(by.className('fa fa-plus')).click();
+ }).then(function () {
+ return visible(by.className('fa fa-hdd-o'));
+ }).then(function () {
+ return browser.findElement(by.className('fa fa-hdd-o')).click();
+ }).then(function () {
+ return visible(by.xpath('//*[@class="modal-body"]/form/div/input'));
+ }).then(function () {
+ return browser.findElement(by.xpath('//*[@class="modal-body"]/form/div/input')).sendKeys(bucket);
+ }).then(function () {
+ return browser.findElement(by.xpath('//*[@class="modal-body"]/form')).submit();
+ }).then(function () {
+ return visible(by.xpath('//*[@class="main"]/a[text()="' + bucket + '"]'));
+ }).then(function () {
+ callback();
+ });
+ }
+
+ function checkBucket(callback) {
+ browser.get('https://' + app.fqdn);
+
+ pageLoaded().then(function () {
+ return browser.findElement(by.xpath(`//a[contains(text(), ${bucket})]`));
+ }).then(function () {
+ callback();
});
}
function openSettings(callback) {
browser.get('https://' + app.fqdn);
- pageLoaded(function () {
- visible(by.id('top-right-menu'), function () {
- browser.findElement(by.id('top-right-menu')).click();
- visible(by.xpath('//*[text()="Settings "]'), function () {
- browser.findElement(by.xpath('//*[text()="Settings "]')).click();
-
- browser.wait(until.elementLocated(by.xpath('//*[text()="Generate"]')), TEST_TIMEOUT).then(function () { callback(); });
- });
- });
+ pageLoaded().then(function () {
+ return visible(by.id('top-right-menu'));
+ }).then(function () {
+ return browser.findElement(by.id('top-right-menu')).click();
+ }).then(function () {
+ return visible(by.xpath('//*[text()="Settings "]'));
+ }).then(function () {
+ return browser.findElement(by.xpath('//*[text()="Settings "]')).click();
+ }).then(function () {
+ return browser.wait(until.elementLocated(by.xpath('//*[text()="Generate"]')), TEST_TIMEOUT);
+ }).then(function () {
+ callback();
});
}
@@ -140,10 +157,19 @@ describe('Application life cycle test', function () {
});
it('can login', login);
- it('can add buckets', addBucket);
+ it('can add bucket', addBucket);
it('can open settings', openSettings);
it('can logout', logout);
+ it('can restart app', function (done) {
+ execSync('cloudron restart --wait');
+ done();
+ });
+
+ it('can login', login);
+ it('has bucket', checkBucket);
+ it('can logout', logout);
+
it('backup app', function () {
execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
@@ -153,7 +179,7 @@ describe('Application life cycle test', function () {
});
it('can login', login);
- it('can add buckets', addBucket);
+ it('has bucket', checkBucket);
it('can open settings', openSettings);
it('can logout', logout);
@@ -166,12 +192,32 @@ describe('Application life cycle test', function () {
});
it('can login', login);
- it('can add buckets', addBucket);
- it('can open settings', openSettings);
+ it('has bucket', checkBucket);
it('can logout', logout);
it('uninstall app', function () {
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
+ // test update
+ it('can install app', function () {
+ execSync('cloudron install --new --wait --appstore-id io.minio.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+ var inspect = JSON.parse(execSync('cloudron inspect'));
+ app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
+ expect(app).to.be.an('object');
+ });
+
+ it('can login', login);
+ it('can add buckets', addBucket);
+ it('can logout', logout);
+ it('can update', function () {
+ execSync('cloudron install --wait --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+ });
+ it('can login', login);
+ it('has bucket', checkBucket);
+ it('can logout', logout);
+ it('uninstall app', function () {
+ execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+ });
});
+