Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>tags/v28.0.2rc4
@@ -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'); | |||
@@ -45,7 +45,7 @@ describe('OCA.Sharing.PublicApp tests', function() { | |||
}); | |||
afterEach(function() { | |||
OC.webroot = originalWebroot; | |||
window._oc_webroot = originalWebroot; | |||
protocolStub.restore(); | |||
hostStub.restore(); | |||
}); |
@@ -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/' | |||
}; |
@@ -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() { | |||
@@ -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'); |
@@ -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() { |