From d95ae3910735be710525ccd04564866bb9d58740 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Fri, 5 May 2017 16:42:58 +0200
Subject: [PATCH] dev #59718 test fix
---
library/Class/User/Settings.php | 2 +-
tests/scenarios/MobileApplication/UserAccountTest.php | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/library/Class/User/Settings.php b/library/Class/User/Settings.php
index 639b2069ab7..747a2ed287a 100644
--- a/library/Class/User/Settings.php
+++ b/library/Class/User/Settings.php
@@ -147,7 +147,7 @@ class Class_User_Settings {
public function getRedmineLibrary() {
- return $lib_id = $this->get(self::REDMINE_LIBRARY)
+ return ($lib_id = $this->get(self::REDMINE_LIBRARY))
? Class_Bib::find($lib_id)
: $this->getUserLib();
}
diff --git a/tests/scenarios/MobileApplication/UserAccountTest.php b/tests/scenarios/MobileApplication/UserAccountTest.php
index 44e623289cd..a477bd327a9 100644
--- a/tests/scenarios/MobileApplication/UserAccountTest.php
+++ b/tests/scenarios/MobileApplication/UserAccountTest.php
@@ -62,6 +62,12 @@ abstract class Scenario_MobileApplication_UserAccountTestCase extends AbstractCo
ZendAfi_Auth::getInstance()->clearIdentity();
}
+
+
+ public function tearDown() {
+ unset($_SERVER['HTTPS']);
+ parent::tearDown();
+ }
}
--
GitLab