From 17c84f8a1ee2004efddbb37250a345d6e1f8b1d9 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Thu, 16 Feb 2017 07:23:47 +0100 Subject: [PATCH] Updated to new upstream version --- CHANGELOG | 4 ++++ CloudronManifest.json | 2 +- Dockerfile | 2 +- test/test.js | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c3f375b..7e4d439 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,3 +6,7 @@ [0.2.0] * Updated to 2017-01-25T03-14-52Z + +[0.2.1] +* Updated to 2017-02-16T01-47-30Z +* This version fixes the settings bug diff --git a/CloudronManifest.json b/CloudronManifest.json index 5cb3965..912b39f 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.0", + "version": "0.2.1", "healthCheckPath": "/minio/login", "httpPort": 8000, "addons": { diff --git a/Dockerfile b/Dockerfile index d4241ff..055bcf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Minio Developers EXPOSE 8000 -ENV VERSION 2017-01-25T03-14-52Z +ENV VERSION 2017-02-16T01-47-30Z RUN mkdir -p /app/code \ && wget https://dl.minio.io/server/minio/release/linux-amd64/archive/minio.RELEASE.${VERSION} -O /app/code/minio \ diff --git a/test/test.js b/test/test.js index 7f2ec72..01ec108 100644 --- a/test/test.js +++ b/test/test.js @@ -108,6 +108,21 @@ describe('Application life cycle test', function () { }); } + 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(); }); + }); + }); + }); + } + xit('build app', function () { execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }); }); @@ -126,6 +141,7 @@ describe('Application life cycle test', function () { it('can login', login); it('can add buckets', addBucket); + it('can open settings', openSettings); it('can logout', logout); it('backup app', function () { @@ -138,6 +154,7 @@ describe('Application life cycle test', function () { it('can login', login); it('can add buckets', addBucket); + it('can open settings', openSettings); it('can logout', logout); it('move to different location', function () { @@ -150,6 +167,7 @@ describe('Application life cycle test', function () { it('can login', login); it('can add buckets', addBucket); + it('can open settings', openSettings); it('can logout', logout); it('uninstall app', function () {