From 57967983d8f19c2c7b549d9d6084bba60b72eecc Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 29 May 2020 19:44:15 +0000 Subject: [PATCH 1/3] remove cruft.. ugh --- .../specs/X_lasttest_automatic_reconnect.js | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 tests/frontend/specs/X_lasttest_automatic_reconnect.js diff --git a/tests/frontend/specs/X_lasttest_automatic_reconnect.js b/tests/frontend/specs/X_lasttest_automatic_reconnect.js deleted file mode 100644 index e2d2df36a4d..00000000000 --- a/tests/frontend/specs/X_lasttest_automatic_reconnect.js +++ /dev/null @@ -1,71 +0,0 @@ -describe('Automatic pad reload on Force Reconnect message', function() { - var padId, $originalPadFrame; - - beforeEach(function(done) { - padId = helper.newPad(function() { - // enable userdup error to have timer to force reconnect - var $errorMessageModal = helper.padChrome$('#connectivity .userdup'); - $errorMessageModal.addClass('with_reconnect_timer'); - - // make sure there's a timeout set, otherwise automatic reconnect won't be enabled - helper.padChrome$.window.clientVars.automaticReconnectionTimeout = 2; - - // open same pad on another iframe, to force userdup error - var $otherIframeWithSamePad = $(''); - $originalPadFrame = $('#iframe-container iframe'); - $otherIframeWithSamePad.insertAfter($originalPadFrame); - - // wait for modal to be displayed - helper.waitFor(function() { - return $errorMessageModal.is(':visible'); - }, 50000).done(done); - }); - - this.timeout(60000); - }); - - it('displays a count down timer to automatically reconnect', function(done) { - var $errorMessageModal = helper.padChrome$('#connectivity .userdup'); - var $countDownTimer = $errorMessageModal.find('.reconnecttimer'); - - expect($countDownTimer.is(':visible')).to.be(true); - - done(); - }); - - context('and user clicks on Cancel', function() { - beforeEach(function() { - var $errorMessageModal = helper.padChrome$('#connectivity .userdup'); - $errorMessageModal.find('#cancelreconnect').click(); - }); - - it('does not show Cancel button nor timer anymore', function(done) { - var $errorMessageModal = helper.padChrome$('#connectivity .userdup'); - var $countDownTimer = $errorMessageModal.find('.reconnecttimer'); - var $cancelButton = $errorMessageModal.find('#cancelreconnect'); - - expect($countDownTimer.is(':visible')).to.be(false); - expect($cancelButton.is(':visible')).to.be(false); - - done(); - }); - }); - - context('and user does not click on Cancel until timer expires', function() { - var padWasReloaded = false; - - beforeEach(function() { - $originalPadFrame.one('load', function() { - padWasReloaded = true; - }); - }); - - it('reloads the pad', function(done) { - helper.waitFor(function() { - return padWasReloaded; - }, 5000).done(done); - - this.timeout(5000); - }); - }); -}); From d898839b6fc09dec3e556b1c04198ca82e2d0c3b Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 4 Jun 2020 20:36:53 +0000 Subject: [PATCH 2/3] housekeeping: close stale issues --- .github/stale.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000000..2e530c6c097 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,23 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 60 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 +# Issues with these labels will never be considered stale +exemptLabels: + - pinned + - security + - Bug + - Serious Bug + - Minor bug + - Black hole bug + - Special case Bug + - Upstream bug +# Label to use when marking an issue as stale +staleLabel: wontfix +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false From 9e0699f306e0f89c680f998f5d0f5ea2c7fd68ec Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 9 Jul 2020 23:51:49 +0000 Subject: [PATCH 3/3] testing installing LO first --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index c86be19334c..43695b3b54a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ services: cache: false +before_install: + - sudo apt-get -y install libreoffice + install: - "bin/installDeps.sh" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)"