D3Public/d3sudolesstests
8
0
Fork 0
Code Pull Requests Projects Releases Activity

add patch for testing library >= 7.2.0

Browse Source
This commit is contained in:
Daniel Seifert 2021-03-13 22:01:11 +01:00
parent b4a1ab1239
commit a1e212a038
Signed by: DanielS
GPG Key ID: 6A513E13AEE66170
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
--- ---
## 1.0.0.0 (2015-12-16) ## 1.1.0.0 (2021-03-13)
### Added
- patch für Testing Library >= 7.2.0
---
## 1.0.0.0 (2021-03-13)
### Added ### Added
- patch für Testing Library 3.0.0.0 to < 7.2.0 - patch für Testing Library 3.0.0.0 to < 7.2.0

6
composer.json
View File

@ -19,15 +19,15 @@
"homepage": "https://www.oxidmodule.com/", "homepage": "https://www.oxidmodule.com/",
"license": [ "license": [
"GPL-3.0-or-later" "GPL-3.0-or-later"
] ],
"require": { "require": {
"oxid-esales/testing-library": ">= 3 < 7.2.0", "oxid-esales/testing-library": ">= 7.2.0",
"cweagans/composer-patches": "^1.6" "cweagans/composer-patches": "^1.6"
}, },
"extra": { "extra": {
"patches": { "patches": {
"oxid-esales/testing-library": { "oxid-esales/testing-library": {
"don't use sudo while test run on restricted servers": "https://git.d3data.de/D3Public/d3sudolesstests/raw/branch/rel_1.0.x/sudolesstests.patch" "don't use sudo while test run on restricted servers": "https://git.d3data.de/D3Public/d3sudolesstests/raw/branch/rel_1.1.x/sudolesstests.patch"
} }
} }
} }

16
sudolesstests.patch
View File

@ -1,6 +1,6 @@
From c9349fd1f8b96474585519fd229d687213570eea Mon Sep 17 00:00:00 2001 From 5c580a54b8cfe3e26f7605ecf637143a6d8e2618 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com> From: Daniel Seifert <git@daniel-seifert.com>
Date: Sat, 13 Mar 2021 00:52:13 +0100 Date: Sat, 13 Mar 2021 00:45:37 +0100
Subject: [PATCH 1/1] remove sudo for test execution on restricted servers Subject: [PATCH 1/1] remove sudo for test execution on restricted servers
--- ---
@ -8,18 +8,18 @@ Subject: [PATCH 1/1] remove sudo for test execution on restricted servers
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/Services/Library/Cache.php b/library/Services/Library/Cache.php diff --git a/library/Services/Library/Cache.php b/library/Services/Library/Cache.php
index 12391cf..c2d28db 100644 index e084763..1003459 100644
--- a/library/Services/Library/Cache.php --- a/library/Services/Library/Cache.php
+++ b/library/Services/Library/Cache.php +++ b/library/Services/Library/Cache.php
@@ -44,7 +44,7 @@ class Cache @@ -45,7 +45,7 @@ class Cache
public function clearTemporaryDirectory()
{ {
if ($sCompileDir = \OxidEsales\Eshop\Core\Registry::get(\OxidEsales\Eshop\Core\ConfigFile::class)->getVar('sCompileDir')) { if ($sCompileDir = \OxidEsales\Eshop\Core\Registry::get(\OxidEsales\Eshop\Core\ConfigFile::class)->getVar('sCompileDir')) {
- CliExecutor::executeCommand("sudo chmod 777 -R $sCompileDir"); if (!is_writable($sCompileDir)) {
+ CliExecutor::executeCommand("chmod 777 -R $sCompileDir"); - CliExecutor::executeCommand("sudo chmod -R 777 $sCompileDir");
+ CliExecutor::executeCommand("chmod -R 777 $sCompileDir");
}
$this->removeTemporaryDirectory($sCompileDir, false); $this->removeTemporaryDirectory($sCompileDir, false);
} }
}
-- --
2.25.1 2.25.1