[stable10] Combine then statements into one step #33501
Conversation
phil-davis
force-pushed
the
stable10-merge-then-steps-into-one-step
branch
from
4d00163
to
822159c
Compare
|
Conflicts resolved - let's see what CI says. |
|
CI https://drone.owncloud.com/owncloud/core/12546/290 Now to look at what happened to |
| @@ -1233,6 +1265,28 @@ public function checkShareFields($body) { | |||
| $value | |||
| ); | |||
| } | |||
| if (!$this->isFieldInShareResponse($field, $value)) { | |||
There was a problem hiding this comment.
$value = $this->replaceValuesFromTable($field, $value);
is missing above this line.
It is in the diff on master
@individual-it
There was a problem hiding this comment.
I don't think that is the issue. $value is set in the function earlier
and the problem is in FeatureContext::checkFields()
There was a problem hiding this comment.
I see - the lines of code above here are still doing the getRemoteBaseUrl() and getLocalBaseUrl() stuff.
And that code puts a / after the base URL for both remote and local.
In master that is now a call to replaceValuesFromTable
Codecov Report
@@ Coverage Diff @@
## stable10 #33501 +/- ##
===========================================
Coverage 62.91% 62.91%
Complexity 18891 18891
===========================================
Files 1239 1239
Lines 74057 74057
Branches 1288 1288
===========================================
Hits 46591 46591
Misses 27084 27084
Partials 382 382
Continue to review full report at Codecov.
|
backport of #33483
backport of #33504
fixes #33499