diff --git a/appveyor.yml b/appveyor.yml index 74f9cc1e7c..db9bdddb51 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ services: # Install scripts. (runs after repo cloning) install: - - cinst -y OpenSSL.Light + - cinst -y OpenSSL.Light --version 1.1.1 - SET PATH=C:\Program Files\OpenSSL;%PATH% - sc config wuauserv start= auto - net start wuauserv diff --git a/eccube_install.sh b/eccube_install.sh index d242ff092c..412c3ce40e 100755 --- a/eccube_install.sh +++ b/eccube_install.sh @@ -30,7 +30,7 @@ CONFIG_PHP="data/config/config.php" ADMIN_MAIL=${ADMIN_MAIL:-"admin@example.com"} SHOP_NAME=${SHOP_NAME:-"EC-CUBE SHOP"} -HTTP_URL=${HTTP_URL:-"http://test.local"} +HTTP_URL=${HTTP_URL:-"http://test.local/"} HTTPS_URL=${HTTPS_URL:-"http://test.local/"} ROOT_URLPATH=${ROOT_URLPATH:-"/"} DOMAIN_NAME=${DOMAIN_NAME:-""} diff --git a/tests/class/module/Cache_Lite/NestedOutputTest.php b/tests/class/module/Cache_Lite/NestedOutputTest.php deleted file mode 100644 index 00499aa3f8..0000000000 --- a/tests/class/module/Cache_Lite/NestedOutputTest.php +++ /dev/null @@ -1,65 +0,0 @@ - - */ - -//require_once __DIR__ . '/../Cache/Lite/NestedOutput.php'; - -class NestedOutputTest extends Common_TestCase -{ - /** - * "Test" used for documenting the nested output buffering feature of php - */ - public function testPhpObNesting() - { - $outsideText = "This is the outside"; - $insideText = "This is the inside"; - ob_start(); - echo $outsideText; - ob_start(); - echo $insideText; - $innerContents = ob_get_contents(); - ob_end_clean(); - $outerContents = ob_get_contents(); - ob_end_clean(); - - $this->assertEquals( $insideText, $innerContents ); - $this->assertEquals( $outsideText, $outerContents ); - } - - /** - * Test for Cache_Lite_NestedOutput - */ - public function testCacheLiteOutputNesting() - { - $outsideText = "This is the outside"; - $insideText = "This is the inside"; - - $options = array( - 'caching' => true, - 'cacheDir' => '/tmp/', - 'lifeTime' => 10 - ); - $cache = new Cache_Lite_NestedOutput($options); - $this->assertFalse($cache->start('foo', 'a')); - echo $outsideText; - $this->assertFalse($cache->start('bar', 'b')); - echo $insideText; - $inside = $cache->end(); - $outside = $cache->end(); - $this->assertEquals($outsideText, $outside, 'Validate outside'); - $this->assertEquals($insideText, $inside, 'Validate inside'); - - $cache = new Cache_Lite_NestedOutput($options); - $this->assertEquals($outsideText, $cache->start('foo', 'a'), 'Validate outside'); - $this->assertEquals($insideText, $cache->start('bar', 'b'), 'Validate inside'); - } -}