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

[13] Remove base url from global cache prefix #8745

Merged
merged 7 commits into from Mar 9, 2018

Conversation

Projects
None yet
3 participants
@juliushaertl
Member

juliushaertl commented Mar 9, 2018

backport of #8716

juliushaertl added some commits Mar 7, 2018

Move base url from global cache prefix to frontend related ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Use JSCombiner from server container when searching for JS files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Actually clear cache values for all base urls
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests to use ICacheFactory
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Use cache prefix for theming as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>

@juliushaertl juliushaertl added this to the Nextcloud 13.0.1 milestone Mar 9, 2018

@juliushaertl juliushaertl requested review from rullzer, MorrisJobke and skjnldsv Mar 9, 2018

@juliushaertl juliushaertl changed the title from Remove base url from global cache prefix to [13] Remove base url from global cache prefix Mar 9, 2018

@MorrisJobke MorrisJobke referenced this pull request Mar 9, 2018

Merged

13.0.1 RC1 #8748

10 of 10 tasks complete

@MorrisJobke MorrisJobke requested a review from ChristophWurst Mar 9, 2018

@rullzer

rullzer approved these changes Mar 9, 2018

@MorrisJobke

This comment has been minimized.

Member

MorrisJobke commented Mar 9, 2018

CI failure :/

@MorrisJobke

Fix CI failure.

Always return the depscache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@codecov

This comment has been minimized.

codecov bot commented Mar 9, 2018

Codecov Report

Merging #8745 into stable13 will increase coverage by 0.11%.
The diff coverage is 66.66%.

@@              Coverage Diff               @@
##             stable13    #8745      +/-   ##
==============================================
+ Coverage        51.3%   51.41%   +0.11%     
- Complexity      25017    25089      +72     
==============================================
  Files            1609     1609              
  Lines           95285    95431     +146     
  Branches         1376     1376              
==============================================
+ Hits            48882    49064     +182     
+ Misses          46403    46367      -36
Impacted Files Coverage Δ Complexity Δ
lib/private/TemplateLayout.php 0% <0%> (ø) 48 <0> (ø) ⬇️
apps/theming/lib/ThemingDefaults.php 91.79% <100%> (ø) 46 <0> (ø) ⬇️
lib/private/Server.php 80.66% <33.33%> (+0.11%) 134 <0> (ø) ⬇️
lib/private/Template/JSCombiner.php 91.48% <75%> (+2.38%) 35 <0> (+5) ⬆️
lib/private/Template/SCSSCacher.php 71.73% <75%> (+0.2%) 36 <0> (ø) ⬇️
...b/private/Files/ObjectStore/ObjectStoreStorage.php 66.39% <0%> (-0.56%) 75% <0%> (+1%)
core/js/js.js 66.4% <0%> (+0.11%) 0% <0%> (ø) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
apps/dav/lib/Upload/ChunkingPlugin.php 96.55% <0%> (+0.25%) 8% <0%> (ø) ⬇️
... and 4 more
@MorrisJobke

This comment has been minimized.

Member

MorrisJobke commented Mar 9, 2018

Still one failure:

There was 1 failure:
57s
177

57s
178
1) Test\Template\SCSSCacherTest::testResetCache
57s
179
Expectation failed for method name is equal to <string:clear> when invoked 1 time(s).
57s
180
Method was expected to be called 1 times, actually called 0 times.

Let me look into it.

Mock method of actual cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>

@MorrisJobke MorrisJobke merged commit b0f0c26 into stable13 Mar 9, 2018

0 of 2 checks passed

continuous-integration/drone/pr this build is pending
Details
continuous-integration/drone/push this build is pending
Details

@MorrisJobke MorrisJobke deleted the stable13-8716 branch Mar 9, 2018

@juliushaertl

This comment has been minimized.

Member

juliushaertl commented Mar 10, 2018

Thanks for fixing the tests @rullzer @MorrisJobke 👍

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