Skip to content

Commit

Permalink
fix(tests): Adjust legacy tests for nextcloud-router update
Browse files Browse the repository at this point in the history
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
  • Loading branch information
susnux committed Jan 25, 2024
1 parent 9fb7d5b commit 163d02e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions apps/files_sharing/tests/js/publicAppSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ describe('OCA.Sharing.PublicApp tests', function() {
var $preview;

beforeEach(function() {
originalWebroot = OC.webroot;
OC.webroot = '/owncloud';
originalWebroot = window._oc_webroot;
window._oc_webroot = '/owncloud';
protocolStub = sinon.stub(OC, 'getProtocol').returns('https');
hostStub = sinon.stub(OC, 'getHost').returns('example.com:9876');

Expand All @@ -45,7 +45,7 @@ describe('OCA.Sharing.PublicApp tests', function() {
});

afterEach(function() {
OC.webroot = originalWebroot;
window._oc_webroot = originalWebroot;
protocolStub.restore();
hostStub.restore();
});
Expand Down
4 changes: 2 additions & 2 deletions core/js/tests/specHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ window._oc_capabilities = {
}

// FIXME: OC.webroot is supposed to be only the path!!!
OC.webroot = location.href + '/';
OC.appswebroots = {
window._oc_webroot = location.href + '/';
window._oc_appswebroots = {
"files": window.webroot + '/apps/files/',
"files_sharing": window.webroot + '/apps/files_sharing/'
};
Expand Down
12 changes: 6 additions & 6 deletions core/js/tests/specs/coreSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ describe('Core base tests', function() {
describe('Base values', function() {
it('Sets webroots', function() {
expect(OC.getRootPath()).toBeDefined();
expect(OC.appswebroots).toBeDefined();
expect(window._oc_appswebroots).toBeDefined();
});
});
describe('filePath', function() {
beforeEach(function() {
OC.webroot = 'http://localhost';
OC.appswebroots.files = OC.getRootPath() + '/apps3/files';
window._oc_webroot = 'http://localhost';
window._oc_appswebroots.files = OC.getRootPath() + '/apps3/files';
});
afterEach(function() {
delete OC.appswebroots.files;
delete window._oc_appswebroots.files;
});

it('Uses a direct link for css and images,' , function() {
Expand All @@ -70,11 +70,11 @@ describe('Core base tests', function() {
var TESTAPP_ROOT = OC.getRootPath() + '/appsx/testapp';

beforeEach(function() {
OC.appswebroots[TESTAPP] = TESTAPP_ROOT;
window._oc_appswebroots[TESTAPP] = TESTAPP_ROOT;
});
afterEach(function() {
// restore original array
delete OC.appswebroots[TESTAPP];
delete window._oc_appswebroots[TESTAPP];
});
it('Generates correct links for core apps', function() {
expect(OC.linkTo('core', 'somefile.php')).toEqual(OC.getRootPath() + '/core/somefile.php');
Expand Down
4 changes: 2 additions & 2 deletions core/js/tests/specs/l10nSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ describe('OC.L10N tests', function() {
var TEST_APP = 'jsunittestapp';

beforeEach(function() {
OC.appswebroots[TEST_APP] = OC.getRootPath() + '/apps3/jsunittestapp';
window._oc_appswebroots[TEST_APP] = OC.getRootPath() + '/apps3/jsunittestapp';
});
afterEach(function() {
OC.L10N._unregister(TEST_APP);
delete OC.appswebroots[TEST_APP];
delete window._oc_appswebroots[TEST_APP];
});

describe('text translation', function() {
Expand Down

0 comments on commit 163d02e

Please sign in to comment.