Update test deps

Still show old changelog link since the current version is just patch
release

CHANGELOG

@@ -461,3 +461,303 @@
 [1.15.0]
 * Update Gitea to 1.11.0
 
+[1.15.1]
+* Update Gitea to 1.11.1
+* Repo name added to automatically generated commit message when merging (#9997) (#10285)
+* Fix Workerpool deadlock (#10283) (#10284)
+* Divide GetIssueStats query in smaller chunks (#10176) (#10282)
+* Fix reply on code review (#10257)
+* Stop hanging issue indexer initialisation from preventing shutdown (#10243) (#10249)
+* Fix filter label emoji width (#10241) (#10244)
+* Fix issue sidebar menus having an infinite height (#10239) (#10240)
+* Fix commit between two commits calculation if there is only last commit (#10225) (#10226)
+* Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)
+* Blacklist manifest.json & milestones user (#10292) (#10293)
+
+[1.15.2]
+* Update Gitea to 1.11.2
+
+[1.15.3]
+* Update Gitea to 1.11.3
+
+[1.15.4]
+* Update Gitea to 1.11.4
+
+[1.16.0]
+* Update Gitea to [1.11.5](https://github.com/go-gitea/gitea/releases/tag/v1.11.5)
+* Update base image to 2.0.0
+
+[1.16.1]
+* Update Gitea to 1.11.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.11.6)
+* Fix missing authorization check on pull for public repos of private/limited org (#11656) (#11683)
+* Use session for retrieving org teams (#11438) (#11439)
+* Return json on 500 error from API (#11574) (#11660)
+* Fix wrong milestone in webhook message (#11596) (#11612)
+* Prevent (caught) panic on login (#11590) (#11598)
+* Fix commit page js error (#11527)
+
+[1.17.0]
+* Update Gitea to 1.12.1
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.0)
+
+[1.18.0]
+* Add forumUrl and update tags and screenshots
+
+[1.18.1]
+* Update Gitea to 1.12.2
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.2)
+
+[1.18.2]
+* Update Gitea to 1.12.3
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.3)
+* Don't change creation date when updating Release (#12343) (#12351)
+* Show 404 page when release not found (#12328) (#12332)
+* Fix emoji detection in certain cases (#12320) (#12327)
+* Reduce emoji size (#12317) (#12327)
+* Fix double-indirection bug in logging IDs (#12294) (#12308)
+* Link to pull list page on sidebar when view pr (#12256) (#12263)
+* Extend Notifications API and return pinned notifications by default (#12164) (#12232)
+
+[1.18.3]
+* Update Gitea to 1.12.4
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.4)
+* Escape provider name in oauth2 provider redirect (#12648) (#12650)
+* Escape Email on password reset page (#12610) (#12612)
+* When reading expired sessions - expire them (#12686) (#12690)
+* StaticRootPath configurable at compile time (#12371) (#12652)
+* Fix to show an issue that is related to a deleted issue (#12651) (#12692)
+* Expire time acknowledged for cache (#12605) (#12611)
+* Fix diff path unquoting (#12554) (#12575)
+* Improve HTML escaping helper (#12562)
+* models: break out of loop (#12386) (#12561)
+* Default empty merger list to those with write permissions (#12535) (#12560)
+* Skip SSPI authentication attempts for /api/internal (#12556) (#12559)
+* Prevent NPE on commenting on lines with invalidated comments (#12549) (#12550)
+* Remove hardcoded ES indexername (#12521) (#12526)
+* Fix bug preventing transfer to private organization (#12497) (#12501)
+* Keys should not verify revoked email addresses (#12486) (#12495)
+* Do not add prefix on http/https submodule links (#12477) (#12479)
+* Fix ignored login on compare (#12476) (#12478)
+* Fix incorrect error logging in Stats indexer and OAuth2 (#12387) (#12422)
+* Upgrade google/go-github to v32.1.0 (#12361) (#12390)
+* Render emoji's of Commit message on feed-page (#12373)
+* Fix handling of diff on unrelated branches when Git 2.28 used (#12370)
+
+[1.18.4]
+* Update Gitea to 1.12.5
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.5)
+* Allow U2F with default settings for gitea in subpath (#12990) (#13001)
+* Prevent empty div when editing comment (#12404) (#12991)
+* On mirror update also update address in DB (#12964) (#12967)
+* Allow extended config on cron settings (#12939) (#12943)
+* Open transaction when adding Avatar email-hash pairs to the DB (#12577) (#12940)
+* Fix internal server error from ListUserOrgs API (#12910) (#12915)
+* Update only the repository columns that need updating (#12900) (#12912)
+* Fix panic when adding long comment (#12892) (#12894)
+* Add size limit for content of comment on action ui (#12881) (#12890)
+* Convert User expose ID each time (#12855) (#12883)
+* Support slashes in release tags (#12864) (#12882)
+* Add missing information to CreateRepo API endpoint (#12848) (#12867)
+* On Migration respect old DefaultBranch (#12843) (#12858)
+* Fix notifications page links (#12838) (#12853)
+* Stop cloning unnecessarily on PR update (#12839) (#12852)
+* Escape more things that are passed through str2html (#12622) (#12850)
+* Remove double escape on labels addition in comments (#12809) (#12810)
+* Fix "only mail on mention" bug (#12775) (#12789)
+* Fix yet another bug with diff file names (#12771) (#12776)
+* RepoInit Respect AlternateDefaultBranch (#12746) (#12751)
+* Fix Avatar Resize (resize algo NearestNeighbor -> Bilinear) (#12745) (#12750)
+
+[1.18.5]
+* Update Gitea to 1.12.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.6)
+* Prevent git operations for inactive users (#13527) (#13537)
+* Disallow urlencoded new lines in git protocol paths if there is a port (#13521) (#13525)
+* API should only return Json (#13511) (#13564)
+* Fix before and since query arguments at API (#13559) (#13560)
+* Prevent panic on git blame by limiting lines to 4096 bytes at most (#13470) (#13492)
+* Fix link detection in repository description with tailing '_' (#13407) (#13408)
+* Remove obsolete change of email on profile page (#13341) (#13348)
+* Fix permission check on get Reactions API endpoints (#13344) (#13346)
+* Add migrated pulls to pull request task queue (#13331) (#13335)
+* API deny wrong pull creation options (#13308) (#13327)
+* Fix initial commit page & binary munching problem (#13249) (#13259)
+* Fix diff parsing (#13157) (#13136) (#13139)
+* Return error 404 not 500 from API if team does not exist (#13118) (#13119)
+* Prohibit automatic downgrades (#13108) (#13111)
+* Fix GitLab Migration Option AuthToken (#13101)
+* GitLab Label Color Normalizer (#12793) (#13100)
+* Log the underlying panic in runMigrateTask (#13096) (#13098)
+* Fix attachments list in edit comment (#13036) (#13097)
+* Fix deadlock when deleting team user (#13093)
+* Fix error create comment on outdated file (#13041) (#13042)
+* Fix repository create/delete event webhooks (#13008) (#13027)
+* Fix internal server error on README in submodule (#13006) (#13016)
+
+[1.19.0]
+* Update Gitea to 1.13.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.13.0)
+
+[1.19.1]
+* Update Gitea to 1.13.1
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.13.1)
+* Security: Hide private participation in Orgs (#13994) (#14031)
+* Security: Fix escaping issue in diff (#14153) (#14154)
+
+[1.19.2]
+* Update Gitea to 1.13.2
+* Prevent panic on fuzzer provided string (#14405) (#14409)
+* Add secure/httpOnly attributes to the lang cookie (#14279) (#14280)
+* If release publisher is deleted use ghost user (#14375)
+* Internal ssh server respect Ciphers, MACs and KeyExchanges settings (#14523) (#14530)
+* Set the name Mapper in migrations (#14526) (#14529)
+* Fix wiki preview (#14515)
+* Update code.gitea.io/sdk/gitea v0.13.1 -> v0.13.2 (#14497)
+* ChangeUserName: rename user files back on DB issue (#14447)
+* Fix lfs preview bug (#14428) (#14433)
+* Ensure timeout error is shown on u2f timeout (#14417) (#14431)
+* Fix Deadlock & Delete affected reactions on comment deletion (#14392) (#14425)
+* Use path not filepath in routers/editor (#14390) (#14396)
+* Check if label template exist first (#14384) (#14389)
+* Fix migration v141 (#14387) (#14388)
+* Use Request.URL.RequestURI() for fcgi (#14347)
+* Use ServerError provided by Context (#14333) (#14345)
+* Fix edit-label form init (#14337)
+* Fix mailIssueCommentBatch for pull request (#14252) (#14296)
+* Render links for commit hashes followed by comma (#14224) (#14227)
+* Send notifications for mentions in pulls, issues, (code-)comments (#14218) (#14221)
+* Fix avatar bugs (#14217) (#14220)
+* Ensure that schema search path is set with every connection on postgres (#14131) (#14216)
+* Fix dashboard issues labels filter bug (#14210) (#14214)
+* When visit /favicon.ico but the static file is not exist return 404 but not continue to handle the route (#14211) (#14213)
+* Fix branch selector on new issue page (#14194) (#14207)
+* Check for notExist on profile repository page (#14197) (#14203)
+
+[1.20.0]
+* Use base image v3
+
+[1.20.1]
+* Update Gitea to 1.13.3
+* Turn default hash password algorithm back to pbkdf2 from argon2 until we find a better one (#14673) (#14675)
+* Fix paging of file commit logs (#14831) (#14879)
+* Print useful error if SQLite is used in settings but not supported (#14476) (#14874)
+* Fix display since time round (#14226) (#14873)
+* When Deleting Repository only explicitly close PRs whose base is not this repository (#14823) (#14842)
+* Set HCaptchaSiteKey on Link Account pages (#14834) (#14839)
+* Fix a couple of CommentAsPatch issues. (#14804) (#14820)
+* Disable broken OAuth2 providers at startup (#14802) (#14811)
+* Repo Transfer permission checks (#14792) (#14794)
+* Fix double alert in oauth2 application edit view (#14764) (#14768)
+* Fix broken spans in diffs (#14678) (#14683)
+* Prevent race in PersistableChannelUniqueQueue.Has (#14651) (#14676)
+* HasPreviousCommit causes recursive load of commits unnecessarily (#14598) (#14649)
+* Do not assume all 40 char strings are SHA1s (#14624) (#14648)
+* Allow org labels to be set with issue templates (#14593) (#14647)
+* Accept multiple SSH keys in single LDAP SSHPublicKey attribute (#13989) (#14607)
+* Fix bug about ListOptions and stars/watchers pagnation (#14556) (#14573)
+* Fix GPG key deletion during account deletion (#14561) (#14569)
+
+[1.20.2]
+* Update Gitea to 1.13.4
+* Fix issue popups (#14898) (#14899)
+* Fix race in LFS ContentStore.Put(...) (#14895) (#14913)
+* Fix a couple of issues with a feeds (#14897) (#14903)
+* When transfering repository and database transaction failed, rollback the renames (#14864) (#14902)
+* Fix race in local storage (#14888) (#14901)
+* Fix 500 on pull view page if user is not loged in (#14885) (#14886)
+
+[1.20.3]
+* Update Gitea to 1.13.5
+* Update to goldmark 1.3.3 (#15059) (#15061)
+* Another clusterfuzz spotted issue (#15032) (#15034)
+* Fix set milestone on PR creation (#14981) (#15001)
+* Prevent panic when editing forked repos by API (#14960) (#14963)
+* Fix bug when upload on web (#15042) (#15055)
+* Delete Labels & IssueLabels on Repo Delete too (#15039) (#15051)
+* Fix postgres ID sequences broken by recreate-table (#15015) (#15029)
+* Fix several render issues (#14986) (#15013)
+* Make sure sibling images get a link too (#14979) (#14995)
+* Fix Anchor jumping with escaped query components (#14969) (#14977)
+* Fix release mail html template (#14976)
+* Fix excluding more than two labels on issues list (#14962) (#14973)
+* Don't mark each comment poster as OP (#14971) (#14972)
+* Add "captcha" to list of reserved usernames (#14930)
+* Re-enable import local paths after reversion from #13610 (#14925) (#14927)
+
+[1.20.4]
+* Update Gitea to 1.13.6
+* Fix bug on avatar middleware (#15124) (#15125)
+* Fix another clusterfuzz identified issue (#15096) (#15114)
+* Fix nil exeption for get pull reviews API #15104 (#15106)
+* Fix markdown rendering in milestone content (#15056) (#15092)
+
+[1.20.5]
+* Update Gitea to 1.13.7
+* Update to bluemonday-1.0.6 (#15294) (#15298)
+* Clusterfuzz found another way (#15160) (#15169)
+* Fix wrong user returned in API (#15139) (#15150)
+* Add 'fonts' into 'KnownPublicEntries' (#15188) (#15317)
+* Speed up enry.IsVendor (#15213) (#15246)
+* Response 404 for diff/patch of a commit that not exist (#15221) (#15238)
+* Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15201)
+* Add size to Save function (#15264) (#15271)
+
+[1.21.0]
+* Update Gitea to 1.14.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.0)
+
+[1.21.1]
+* Update Gitea to 1.14.1
+* Fix bug clone wiki (#15499) (#15502)
+* Github Migration ignore rate limit, if not enabled (#15490) (#15495)
+* Use subdir for URL (#15446) (#15493)
+* Query the DB for the hash before inserting in to email_hash (#15457) (#15491)
+* Ensure review dismissal only dismisses the correct review (#15477) (#15489)
+* Use index of the supported tags to choose user lang (#15452) (#15488)
+* Fix wrong file link in code search page (#15466) (#15486)
+* Quick template fix for built-in SSH server in admin config (#15464) (#15481)
+* Prevent superfluous response.WriteHeader (#15456) (#15476)
+* Fix ambiguous argument error on tags (#15432) (#15474)
+* Add created_unix instead of expiry to migration (#15458) (#15463)
+* Fix repository search (#15428) (#15442)
+* Prevent NPE on avatar direct rendering if federated avatars disabled (#15434) (#15439)
+* Fix wiki clone urls (#15430) (#15431)
+* Fix dingtalk icon url at webhook (#15417) (#15426)
+* Standardise icon on projects PR page (#15387) (#15408)
+* Add option to skip LFS/attachment files for dump (#15407) (#15492)
+* Clone panel fixes (#15436)
+* Use semantic dropdown for code search query type (#15276) (#15364)
+
+[1.21.2]
+* Update Gitea to 1.14.2
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.2)
+* Display conflict-free merge messages for pull requests (#15773) (#15796)
+* Exponential Backoff for ByteFIFO (#15724) (#15793)
+* Issue list alignment tweaks (#15483) (#15766)
+* Implement delete release attachments and update release attachments' name (#14130) (#15666)
+* Add placeholder text to deploy key textarea (#15575) (#15576)
+* Project board improvements (#15429) (#15560)
+* Repo branch page: label size, PR ref, new PR button alignment (#15363) (#15365)
+
+[1.21.3]
+* Update Gitea to 1.14.3
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.3)
+* Encrypt migration credentials at rest (#15895) (#16187)
+* Only check access tokens if they are likely to be tokens (#16164) (#16171)
+* Add missing SameSite settings for the i_like_gitea cookie (#16037) (#16039)
+* Fix setting of SameSite on cookies (#15989) (#15991)
+
+[1.21.4]
+* Update Gitea to 1.14.4
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.4)
+* Fix relative links in postprocessed images (#16334) (#16340)
+* Fix list_options GetStartEnd (#16303) (#16305)
+* Fix API to use author for commits instead of committer (#16276) (#16277)
+* Handle misencoding of login_source cfg in mssql (#16268) (#16275)
+* Fixed issues not updated by commits (#16254) (#16261)
+* Improve efficiency in FindRenderizableReferenceNumeric and getReference (#16251) (#16255)
+* Use html.Parse rather than html.ParseFragment (#16223) (#16225)
+* Fix milestone counters on new issue (#16183) (#16224)
+* reqOrgMembership calls need to be preceded by reqToken (#16198) (#16219)
+

CloudronManifest.json

@@ -4,9 +4,10 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.15.0",
-  "healthCheckPath": "/healthcheck",
+  "version": "1.21.4",
+  "healthCheckPath": "/explore",
   "httpPort": 3000,
+  "memoryLimit": 536870912,
   "addons": {
     "mysql": { },
     "sendmail": { },
@@ -26,15 +27,16 @@
   "icon": "file://logo.png",
   "optionalSso": true,
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/1.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/2.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/3.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/4.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/5.png"
+    "https://screenshots.cloudron.io/io.gitea.cloudronapp/1.png",
+    "https://screenshots.cloudron.io/io.gitea.cloudronapp/2.png",
+    "https://screenshots.cloudron.io/io.gitea.cloudronapp/3.png",
+    "https://screenshots.cloudron.io/io.gitea.cloudronapp/4.png",
+    "https://screenshots.cloudron.io/io.gitea.cloudronapp/5.png"
   ],
-  "tags": [ "version control", "git", "code hosting", "development" ],
+  "tags": [ "version control", "git", "code hosting", "development", "github", "bitbucket", "gitlab" ],
   "changelog": "file://CHANGELOG",
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "4.1.4",
-  "documentationUrl": "https://cloudron.io/documentation/apps/gitea/"
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/19/gitea",
+  "documentationUrl": "https://docs.cloudron.io/apps/gitea/"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.11.0</upstream>
+This app packages Gitea <upstream>1.14.4</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 

Dockerfile

@@ -1,6 +1,4 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
-
-ARG VERSION=1.11.0
+FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
 
 RUN apt-get update && \
     apt-get install -y openssh-server git && \
@@ -16,6 +14,9 @@ RUN passwd -d git
 
 RUN mkdir -p /home/git/gitea
 WORKDIR /home/git
+
+ARG VERSION=1.14.4
+
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea
 

POSTINSTALL.md

@@ -1,14 +1,8 @@
-A default admin user has been setup with the following credentials (use the `Local` authentication source when logging in):
+This app is pre-setup with an admin account (use the `Local` authentication source for logging in as admin).
+The initial credentials are:
 
-```
-username: root
-password: changeme
-```
+**Username**: root<br/>
+**Password**: changeme<br/>
 
-**Note:** Please change the password and email immediately after installation.
-
-<sso>
-This app integrates with the Cloudron SSO. Cloudron users can login and use Gitea
-using the `Cloudron` authentication source.
-</sso>
+Please change the admin password immediately.
 

start.sh

@@ -26,7 +26,7 @@ setup_ldap_source() {
 setup_root_user() {
     set -eu
 
-    if sudo -H -u git /home/git/gitea/gitea admin create-user --name root --password changeme --email test@cloudron.io --admin -c /run/gitea/app.ini; then
+    if sudo -H -u git /home/git/gitea/gitea admin user create --name root --password changeme --email test@cloudron.io --admin -c /run/gitea/app.ini; then
         echo "==> root user added"
     else
         echo "==> Failed to add root user"
@@ -38,7 +38,7 @@ setup_auth() {
     set -eu
 
     # Wait for gitea to finish db setup, before we do any db operations
-    while ! curl --fail http://localhost:3000/healthcheck; do
+    while ! curl --fail http://localhost:3000/explore; do
         echo "==> Waiting for gitea to come up"
         sleep 1
     done

test/package.json

@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "selenium-webdriver": "^3.6.0",
-    "chromedriver": "^76.0.1",
+    "chromedriver": "^91.0.1",
     "expect.js": "^0.3.1",
-    "mocha": "^6.2.2",
-    "rimraf": "^3.0.0",
-    "superagent": "^5.1.0"
+    "mocha": "^9.0.2",
+    "rimraf": "^3.0.2",
+    "selenium-webdriver": "^3.6.0",
+    "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+require('chromedriver');
+
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     fs = require('fs'),
@@ -31,9 +33,8 @@ describe('Application life cycle test', function () {
     var LOCATION = 'test';
     var SSH_PORT = 29420;
 
-    var browser;
     var app;
-    var token;
+    var browser;
 
     var repodir = '/tmp/testrepo';
     var reponame = 'testrepo';
@@ -46,20 +47,11 @@ describe('Application life cycle test', function () {
         browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
         rimraf.sync(repodir);
-        done();
     });
 
-    function waitForUrl(url) {
-        return browser.wait(function () {
-            return browser.getCurrentUrl().then(function (currentUrl) {
-                return currentUrl === url;
-            });
-        }, TIMEOUT);
-    }
-
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
 
@@ -112,26 +104,6 @@ return done();
         });
     }
 
-    function editFile(done) {
-        browser.get('https://' + app.fqdn + '/' + username + '/' + reponame + '/_edit/master/newfile').then(function () {
-            var cm = browser.findElement(By.xpath('//div[contains(@class,"CodeMirror")]'));
-            var text = 'yo';
-            return browser.executeScript('arguments[0].CodeMirror.setValue("' + text + '");', cm);
-        }).then(function () {
-            return browser.findElement(By.xpath('//input[@name="commit_summary"]')).sendKeys('Dummy edit');
-        }).then(function () {
-            // explicitly make the button clickable since CodeMirror.setValue() does not update the form state correctly
-            var button = browser.findElement(By.xpath('//button[contains(text(), "Commit Changes")]'));
-            return browser.executeScript('arguments[0].removeAttribute("disabled")', button);
-        }).then(function () {
-            return browser.findElement(By.xpath('//button[contains(text(), "Commit Changes")]')).click();
-        }).then(function () {
-            return waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/branch/master/newfile');
-        }).then(function () {
-            done();
-        });
-    }
-
     function login(username, password, done) {
         browser.get('https://' + app.fqdn + '/user/login').then(function () {
             return browser.findElement(By.id('user_name')).sendKeys(username);
@@ -151,8 +123,14 @@ return done();
     }
 
     function logout(done) {
-        browser.get('https://' + app.fqdn + '/user/logout').then(function () {
-            return waitForUrl('https://' + app.fqdn + '/explore/repos');
+        browser.get('https://' + app.fqdn).then(function () {
+            return browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click();
+        }).then(function () {
+            browser.sleep(2000);
+        }).then(function () {
+            return browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click();
+        }).then(function () {
+            browser.sleep(2000);
         }).then(function () {
             done();
         });
@@ -281,32 +259,30 @@ return done();
         });
     }
 
-    xit('build app', function () {
-        execSync('cloudron build', EXEC_ARGS);
-    });
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
 
-    it('can login', function (done) {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+    // it('can login', function (done) {
+    //     var inspect = JSON.parse(execSync('cloudron inspect'));
 
-        superagent.post(`https://${inspect.apiEndpoint}/api/v1/developer/login`).send({
-            username: username,
-            password: password
-        }).end(function (error, result) {
-            if (error) return done(error);
-            if (result.statusCode !== 200) return done(new Error('Login failed with status ' + result.statusCode));
+    //     superagent.post(`https://${inspect.apiEndpoint}/api/v1/developer/login`).send({
+    //         username: username,
+    //         password: password
+    //     }).end(function (error, result) {
+    //         if (error) return done(error);
+    //         if (result.statusCode !== 200) return done(new Error('Login failed with status ' + result.statusCode));
 
-            token = result.body.accessToken;
+    //         token = result.body.accessToken;
 
-            superagent.get(`https://${inspect.apiEndpoint}/api/v1/profile`)
-                .query({ access_token: token }).end(function (error, result) {
-                if (error) return done(error);
-                if (result.statusCode !== 200) return done(new Error('Get profile failed with status ' + result.statusCode));
+    //         superagent.get(`https://${inspect.apiEndpoint}/api/v1/profile`)
+    //             .query({ access_token: token }).end(function (error, result) {
+    //             if (error) return done(error);
+    //             if (result.statusCode !== 200) return done(new Error('Get profile failed with status ' + result.statusCode));
 
-                email = result.body.email;
-                done();
-            });
-        });
-    });
+    //             email = result.body.email;
+    //             done();
+    //         });
+    //     });
+    // });
 
     it('install app', function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
 
@@ -337,7 +313,6 @@ return done();
     it('can clone the url', cloneRepo);
 
     it('can add and push a file', pushFile);
-    it('can edit file', editFile);
 
     it('can add custom file', addCustomFile);
     it('can check custom file', checkCustomFile);
@@ -349,13 +324,8 @@ return done();
     it('can clone the url', cloneRepo);
     it('file exists in repo', fileExists);
 
-    it('backup app', function () {
-        execSync('cloudron backup create --app ' + app.id, EXEC_ARGS);
-    });
-
-    it('restore app', function () {
-        execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
-    });
+    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+    it('restore app', function () { execSync('cloudron restore --app ' + app.id, EXEC_ARGS); });
 
     it('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);