Browse Source

Fix jsunit failures

Signed-off-by: Julius Härtl <jus@bitgrid.net>
tags/v25.0.0beta4
Julius Härtl 1 year ago
parent
commit
aa85e1c2af
No account linked to committer's email address
4 changed files with 5 additions and 46 deletions
  1. 0
    42
      core/js/tests/specs/coreSpec.js
  2. 2
    1
      core/src/init.js
  3. 2
    2
      dist/core-main.js
  4. 1
    1
      dist/core-main.js.map

+ 0
- 42
core/js/tests/specs/coreSpec.js View File

@@ -308,48 +308,6 @@ describe('Core base tests', function() {
expect(OC.generateUrl('apps/files/download{file}')).toEqual(OC.getRootPath() + '/index.php/apps/files/download%7Bfile%7D');
});
});
describe('Main menu mobile toggle', function() {
var clock;
var $toggle;
var $navigation;

beforeEach(function() {
jQuery.fx.off = true;
clock = sinon.useFakeTimers();
$('#testArea').append('<div id="header">' +
'<a class="menutoggle header-appname-container" href="#">' +
'<h1 class="header-appname"></h1>' +
'<div class="icon-caret"></div>' +
'</a>' +
'</div>' +
'<div id="navigation"></div>');
$toggle = $('#header').find('.menutoggle');
$navigation = $('#navigation');
});
afterEach(function() {
jQuery.fx.off = false;
clock.restore();
$(document).off('ajaxError');
});
it('Sets up menu toggle', function() {
window.initCore();
expect($navigation.hasClass('menu')).toEqual(true);
});
it('Clicking menu toggle toggles navigation in', function() {
window.initCore();
// fore show more apps icon since otherwise it would be hidden since no icons are available
clock.tick(1 * 1000);
$('#more-apps').show();

expect($navigation.is(':visible')).toEqual(false);
$toggle.click();
clock.tick(1 * 1000);
expect($navigation.is(':visible')).toEqual(true);
$toggle.click();
clock.tick(1 * 1000);
expect($navigation.is(':visible')).toEqual(false);
});
});
describe('Util', function() {
describe('computerFileSize', function() {
it('correctly parses file sizes from a human readable formated string', function() {

+ 2
- 1
core/src/init.js View File

@@ -36,7 +36,8 @@ import { setUp as setUpMainMenu } from './components/MainMenu'
import { setUp as setUpUserMenu } from './components/UserMenu'
import PasswordConfirmation from './OC/password-confirmation'

const breakpointMobileWidth = getComputedStyle(document.documentElement).getPropertyValue('--breakpoint-mobile')
// keep in sync with core/css/variables.scss
const breakpointMobileWidth = 1024

const initLiveTimestamps = () => {
// Update live timestamps every 30 seconds

+ 2
- 2
dist/core-main.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/core-main.js.map
File diff suppressed because it is too large
View File


Loading…
Cancel
Save