From 4f0a318e02db1fcc5769049e7eff5da5493d865a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 14 Jun 2018 17:24:43 +0200 Subject: [PATCH] Fixed theming tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../Controller/ThemingControllerTest.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 360eb7083a..a2105264f1 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -151,20 +151,20 @@ class ThemingControllerTest extends TestCase { $this->scssCacher ->expects($this->once()) ->method('getCachedSCSS') - ->with('core', '/core/css/server.scss') - ->willReturn('/core/css/someHash-server.scss'); + ->with('core', '/core/css/css-variables.scss') + ->willReturn('/core/css/someHash-css-variables.scss'); $this->urlGenerator ->expects($this->once()) ->method('linkTo') - ->with('', '/core/css/someHash-server.scss') - ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); + ->with('', '/core/css/someHash-css-variables.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss'); $expected = new DataResponse( [ 'data' => [ 'message' => $message, - 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss', ], 'status' => 'success', ] @@ -604,13 +604,13 @@ class ThemingControllerTest extends TestCase { $this->scssCacher ->expects($this->once()) ->method('getCachedSCSS') - ->with('core', '/core/css/server.scss') - ->willReturn('/core/css/someHash-server.scss'); + ->with('core', '/core/css/css-variables.scss') + ->willReturn('/core/css/someHash-css-variables.scss'); $this->urlGenerator ->expects($this->once()) ->method('linkTo') - ->with('', '/core/css/someHash-server.scss') - ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); + ->with('', '/core/css/someHash-css-variables.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss'); $expected = new DataResponse( [ @@ -618,7 +618,7 @@ class ThemingControllerTest extends TestCase { [ 'value' => 'MyValue', 'message' => 'Saved', - 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss', ], 'status' => 'success' ] @@ -648,13 +648,13 @@ class ThemingControllerTest extends TestCase { $this->scssCacher ->expects($this->once()) ->method('getCachedSCSS') - ->with('core', '/core/css/server.scss') - ->willReturn('/core/css/someHash-server.scss'); + ->with('core', '/core/css/css-variables.scss') + ->willReturn('/core/css/someHash-css-variables.scss'); $this->urlGenerator ->expects($this->once()) ->method('linkTo') - ->with('', '/core/css/someHash-server.scss') - ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); + ->with('', '/core/css/someHash-css-variables.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss'); $this->imageManager->expects($this->once()) ->method('delete') ->with($filename); @@ -665,7 +665,7 @@ class ThemingControllerTest extends TestCase { [ 'value' => $value, 'message' => 'Saved', - 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss', ], 'status' => 'success' ]