Skip to content

Replace deprecated sinon reset() call with resetHistory() #9348

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
Merged
skjnldsv merged 1 commit into from
Apr 30, 2018
Merged

Replace deprecated sinon reset() call with resetHistory() #9348

skjnldsv merged 1 commit into from
Apr 30, 2018

Conversation

@juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Apr 30, 2018

This fixes the jsunit CI error that came when it was run with sinon>5.0.0 which was release 3 days ago:

FAILED
	TypeError: undefined is not a function (evaluating 'showNotificationSpy.reset()') in settings/tests/js/users/deleteHandlerSpec.js (line 82)
	settings/tests/js/users/deleteHandlerSpec.js:82:28

See sinonjs/sinon@88e6e5f

@juliusknorr
Replace deprecated sinon reset() call with resetHistory()
16865e5 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr added this to the Nextcloud 14 milestone Apr 30, 2018
@juliusknorr juliusknorr mentioned this pull request Apr 30, 2018
Merged
skjnldsv
skjnldsv approved these changes Apr 30, 2018
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch :)

@codecov
Copy link

codecov bot commented Apr 30, 2018

Codecov Report

Merging #9348 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #9348      +/-   ##
============================================
- Coverage     51.93%   51.92%   -0.01%     
  Complexity    25394    25394              
============================================
  Files          1608     1608              
  Lines         95444    95444              
  Branches       1393     1393              
============================================
- Hits          49566    49561       -5     
- Misses        45878    45883       +5
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
core/js/js.js 65.41% <0%> (-0.56%) 0% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.7% <0%> (+0.24%) 136% <0%> (ø) ⬇️

ChristophWurst
ChristophWurst approved these changes Apr 30, 2018
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 30, 2018
@skjnldsv skjnldsv merged commit 49f26d1 into master Apr 30, 2018
@skjnldsv skjnldsv deleted the fix-js-tests branch April 30, 2018 12:54
This was referenced May 2, 2018
Merged
Merged
@juliusknorr
Copy link
Member Author

juliusknorr commented May 2, 2018

stable13 #9358
stable12 #9359

@juliusknorr juliusknorr mentioned this pull request May 24, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

5 participants

@juliusknorr @ChristophWurst @skjnldsv @MorrisJobke