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.

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

Fix OCS unit tests after two share merges #21975

Merged
merged 1 commit into from
Jan 28, 2016
Merged

Conversation

rullzer
Copy link
Contributor

@rullzer rullzer commented Jan 28, 2016

Merging of #21957 and #21960 created some conflicts.

Should all be fixed now!

CC: @PVince81 @MorrisJobke @DeepDiver1975 @nickvergessen @schiesbn @LukasReschke

* Use getNode
* Return IShare object so typechecking is happy
@rullzer rullzer added this to the 9.0-current milestone Jan 28, 2016
@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @DeepDiver1975 to be a potential reviewer

$this->callback(function (IShare $share) use ($path, $currentUser) {
return $share->getPath() === $path &&
$this->callback(function (\OCP\Share\IShare $share) use ($path, $currentUser) {
return $share->getNode() === $path &&
Copy link
Contributor

Choose a reason for hiding this comment

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

Node === string ?

Copy link
Contributor

Choose a reason for hiding this comment

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

$path = $this->getMock('\OCP\Files\Folder');

@PVince81 PVince81 mentioned this pull request Jan 28, 2016
17 tasks
@icewind1991
Copy link
Contributor

Fixes the tests 👍

@PVince81
Copy link
Contributor

👍

DeepDiver1975 added a commit that referenced this pull request Jan 28, 2016
Fix OCS unit tests after two share merges
@DeepDiver1975 DeepDiver1975 merged commit 476720a into master Jan 28, 2016
@DeepDiver1975 DeepDiver1975 deleted the fix_ocs_unit_tests branch January 28, 2016 14:09
@lock lock bot locked as resolved and limited conversation to collaborators Aug 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants