Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump jasmine-core from 2.99.1 to 5.1.1 in /build #40956

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump jasmine-core from 2.99.1 to 5.1.1 in /build #40956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b5a28
chore(deps): Bump jasmine-core from 2.99.1 to 5.1.1 in /build
dependabot[bot] Oct 10, 2023
68df459
fix: js tests for jasmine 5.x.x
DeepDiver1975 Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/files/tests/js/favoritespluginspec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ describe('OCA.Files.FavoritesPlugin tests', function() {
'</div>' +
'</div>'
);
OCA.Files.App.initialize();
OC.Plugins.attach('OCA.Files.App', Plugin);
fileList = Plugin.showFileList($('#app-content-favorites'));
});
Expand Down
15 changes: 0 additions & 15 deletions apps/files_external/tests/js/settingsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,6 @@ describe('OCA.External.Settings tests', function() {
expect(storage.validate()).toBe(false);
});
});
describe('update storage', function() {
// TODO
});
describe('delete storage', function() {
// TODO
});
describe('recheck storages', function() {
// TODO
});
describe('mount options dropdown', function() {
var $tr;
var $td;
Expand Down Expand Up @@ -414,12 +405,6 @@ describe('OCA.External.Settings tests', function() {
});
});
});
describe('applicable user list', function() {
// TODO: test select2 retrieval logic
});
describe('allow user mounts section', function() {
// TODO: test allowUserMounting section
});

describe('mountConfigLoaded event is triggered', function() {
var view;
Expand Down
4 changes: 0 additions & 4 deletions apps/files_sharing/tests/js/shareSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ describe('OCA.Sharing.Util tests', function() {
fileList.destroy();
fileList = null;
});

describe('Sharing data in table row', function() {
// TODO: test data-permissions, data-share-owner, etc
});
describe('Share action icon', function() {
it('do not shows share text when not shared', function() {
var $action, $tr;
Expand Down
23 changes: 0 additions & 23 deletions apps/files_trashbin/tests/js/filelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,29 +211,6 @@ describe('OCA.Trashbin.FileList tests', function() {
expect(fileList.$el.find('tbody tr .filesize').length).toEqual(0);
});
});
describe('File actions', function() {
describe('Deleting single files', function() {
// TODO: checks ajax call
// TODO: checks spinner
// TODO: remove item after delete
// TODO: bring back item if delete failed
});
describe('Restoring single files', function() {
// TODO: checks ajax call
// TODO: checks spinner
// TODO: remove item after restore
// TODO: bring back item if restore failed
});
});
describe('file previews', function() {
// TODO: check that preview URL is going through files_trashbin
});
describe('loading file list', function() {
// TODO: check that ajax URL is going through files_trashbin
});
describe('breadcrumbs', function() {
// TODO: test label + URL
});
describe('elementToFile', function() {
var $tr;

Expand Down
2 changes: 1 addition & 1 deletion build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"handlebars": "^4.7.8",
"jasmine-core": "^2.99.1",
"jasmine-core": "^5.1.1",
"jasmine-sinon": "^0.4.0",
"karma": "^6.4.2",
"karma-coverage": "*",
Expand Down
8 changes: 4 additions & 4 deletions build/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,10 +1129,10 @@ istanbul-reports@^3.0.5:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"

jasmine-core@^2.99.1:
version "2.99.1"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
jasmine-core@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-5.1.1.tgz#38b6ccfbe60aa2a863cf441751d9639b5a571edc"
integrity sha512-UrzO3fL7nnxlQXlvTynNAenL+21oUQRlzqQFsA2U11ryb4+NLOCOePZ70PTojEaUKhiFugh7dG0Q+I58xlPdWg==

jasmine-sinon@^0.4.0:
version "0.4.0"
Expand Down
4 changes: 3 additions & 1 deletion core/js/tests/specHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ window.oc_config = {
blacklist_files_regex: '\.(part|filepart)$'
};
window.oc_appconfig = {
core: {}
core: {},
files: {},
files_sharing: {}
};
window.oc_defaults = {};
window.oc_requesttoken = 'testrequesttoken';
Expand Down
21 changes: 11 additions & 10 deletions core/js/tests/specs/setupchecksSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ describe('OC.SetupChecks tests', function() {
oc_dataURL = "data";

it('should return an error if data directory is not protected', function(done) {
suite.server.respondWith([ 200, { "Content-Type": "text/plain" }, '*cough*HTACCESSFAIL*cough*']);
var async = OC.SetupChecks.checkDataProtected();

suite.server.requests[0].respond(200, {'Content-Type': 'text/plain'}, '*cough*HTACCESSFAIL*cough*');
suite.server.respond();

async.done(function( data, s, x ){
expect(data).toEqual([
Expand All @@ -116,9 +116,9 @@ describe('OC.SetupChecks tests', function() {
});

it('should not return an error if data directory is protected', function(done) {
suite.server.respondWith([ 403, { "Content-Type": "text/plain" }, '403']);
var async = OC.SetupChecks.checkDataProtected();

suite.server.requests[0].respond(403);
suite.server.respond();

async.done(function( data, s, x ){
expect(data).toEqual([]);
Expand All @@ -127,9 +127,9 @@ describe('OC.SetupChecks tests', function() {
});

it('should not return an error if data directory is protected and redirects to main page', function(done) {
suite.server.respondWith([200, {'Content-Type': 'text/plain'}, '<html><body>blah</body></html>']);
var async = OC.SetupChecks.checkDataProtected();

suite.server.requests[0].respond(200, {'Content-Type': 'text/plain'}, '<html><body>blah</body></html>');
suite.server.respond();

async.done(function( data, s, x ){
expect(data).toEqual([]);
Expand All @@ -153,9 +153,7 @@ describe('OC.SetupChecks tests', function() {

describe('checkSetup', function() {
it('should return an error if server has no internet connection', function(done) {
var async = OC.SetupChecks.checkSetup();

suite.server.requests[0].respond(
suite.server.respondWith([
200,
{
'Content-Type': 'application/json'
Expand All @@ -168,7 +166,10 @@ describe('OC.SetupChecks tests', function() {
isCorrectMemcachedPHPModuleInstalled: true,
hasPassedCodeIntegrityCheck: true,
})
);
]);
var async = OC.SetupChecks.checkSetup();
suite.server.respond();


async.done(function( data, s, x ){
expect(data).toEqual([
Expand Down