X Tutup
Skip to content

[10.5.0] Adjust enable lock file action#37700

Merged
DeepDiver1975 merged 3 commits intorelease-10.5.0from
adjust-enable_lock_file_action-10.5.0
Jul 20, 2020
Merged

[10.5.0] Adjust enable lock file action#37700
DeepDiver1975 merged 3 commits intorelease-10.5.0from
adjust-enable_lock_file_action-10.5.0

Conversation

@phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jul 17, 2020

Description

  • change enable_lock_file_action so that it enables with the string yes instead of expecting a boolean true
  • add some basic UI acceptance tests that verify that the "Lock file" option appears (or not) in the file action menu on the UI

Related Issue

Related to #37697

How Has This Been Tested?

CI and manually doing:

php occ config:app:set files enable_lock_file_action --value 'yes'
php occ config:app:set files enable_lock_file_action --value 'no'
php occ config:app:delete files enable_lock_file_action

and observing that the "Lock file" option in the UI comes and goes appropriately.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@phil-davis phil-davis self-assigned this Jul 17, 2020
@owncloud owncloud deleted a comment from update-docs bot Jul 17, 2020
@phil-davis phil-davis mentioned this pull request Jul 17, 2020
Merged
11 tasks
@pmaier1 pmaier1 mentioned this pull request Jul 17, 2020
Merged
@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 17, 2020

https://drone.owncloud.com/owncloud/core/25960/107/9
Stupid yarn install error - this is happening "randomly" more often the last days.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

8 similar comments
@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@jnweiger
Copy link
Contributor

jnweiger commented Jul 17, 2020

For the sake of a release-process: Please redirect to master for 10.5.1 !

@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jul 17, 2020

Codecov Report

Merging #37700 into release-10.5.0 will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.5.0   #37700   +/-   ##
=================================================
  Coverage             64.74%   64.74%           
  Complexity            19363    19363           
=================================================
  Files                  1281     1281           
  Lines                 75628    75628           
  Branches               1333     1333           
=================================================
  Hits                  48966    48966           
  Misses                26270    26270           
  Partials                392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.93% <0.00%> (ø) 19363.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/App.php 20.00% <0.00%> (ø) 3.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee3b6a7...e83e85f. Read the comment docs.

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 17, 2020

@micbar @DeepDiver1975 or whoever. codecov/patch fails, I expect because apps/files/lib/App.php has no unit tests.
I guess that is life? No test coverage for this sort of stuff.

@phil-davis phil-davis mentioned this pull request Jul 17, 2020
Closed
11 tasks
@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 20, 2020 •
edited
Loading

This is not backward-compatible with the current process in release-10.5.0 for setting and clearing manual file locking. Leaving it to 10.5.1 means that we will have to have some migration process for the setting and different documentation for 10.5.0 and 10.5.1.

That seems very unfortunate when we already have the solution here, with basic acceptance tests, the PR to master has been code-reviewed by @DeepDiver1975 aand I have done manual tests on this change.

@micbar decision?

@phil-davis phil-davis requested a review from jnweiger July 20, 2020 11:15
@DeepDiver1975 DeepDiver1975 merged commit 2214d68 into release-10.5.0 Jul 20, 2020
@delete-merged-branch delete-merged-branch bot deleted the adjust-enable_lock_file_action-10.5.0 branch July 20, 2020 11:43
phil-davis added a commit to owncloud/docs that referenced this pull request Jul 20, 2020
@phil-davis
Adjust enable_lock_file_action command
a9f6087 
It was changed in PR owncloud/core#37700 so that the value must be set to "yes" (rather than "true")
@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 20, 2020

Release notes have been updated: owncloud/docs@a9f6087

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DeepDiver1975 DeepDiver1975 DeepDiver1975 approved these changes

@micbar micbar Awaiting requested review from micbar

@jnweiger jnweiger Awaiting requested review from jnweiger

Assignees

@phil-davis phil-davis

Labels

3 - To Review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@phil-davis @jnweiger @DeepDiver1975
X Tutup