Skip to content

Commit 9e144f0

Browse files
committed
Fixing integration tests
1 parent a1bd89d commit 9e144f0

3 files changed

Lines changed: 23 additions & 9 deletions

File tree

SystemSettings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ private function createBackendSetting()
344344

345345
private function createUseWhatRedisBackendType()
346346
{
347-
return $this->makeSetting('useWhatRedisBackendType', $default = 0, FieldConfig::TYPE_INT, function (FieldConfig $field) {
347+
return $this->makeSetting('useWhatRedisBackendType', $default = 1, FieldConfig::TYPE_INT, function (FieldConfig $field) {
348348
$field->title = 'Redis type';
349349
$field->uiControl = FieldConfig::UI_CONTROL_RADIO;
350350
$field->availableValues = $this->getAvailableRedisBackendTypes();

tests/Framework/TestCase/IntegrationTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function setUp(): void
3535

3636
protected function enableRedisSentinel($master = 'mymaster')
3737
{
38-
Config::getInstance()->QueuedTracking = array('useSentinelBackend' => '1', 'sentinelMasterName' => $master);
38+
Config::getInstance()->QueuedTracking = array('useWhatRedisBackendType' => '2', 'sentinelMasterName' => $master);
3939
}
4040

4141
protected function disableRedisSentinel()

tests/Integration/SettingsTest.php

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,27 @@ public function test_sentinelMasterName_ShouldTrimTheGivenValue_IfNotEmpty()
236236
$this->assertSame('test', $this->settings->sentinelMasterName->getValue());
237237
}
238238

239-
public function test_useSentinelBackend()
239+
public function test_useWhatRedisBackendType()
240240
{
241-
$this->settings->useSentinelBackend->setValue('0');
242-
$this->assertFalse($this->settings->useSentinelBackend->getValue());
241+
$this->settings->useWhatRedisBackendType->setValue(1);
242+
$this->assertFalse($this->settings->isUsingSentinelBackend());
243+
244+
$this->settings->useWhatRedisBackendType->setValue(3);
245+
$this->assertFalse($this->settings->isUsingSentinelBackend());
246+
247+
$this->settings->useWhatRedisBackendType->setValue(2);
248+
$this->assertTrue($this->settings->isUsingSentinelBackend());
249+
}
250+
251+
public function testIsUsingClusterBackend()
252+
{
253+
$this->settings->useWhatRedisBackendType->setValue(1);
254+
$this->assertFalse($this->settings->isUsingClusterBackend());
255+
$this->settings->useWhatRedisBackendType->setValue(2);
256+
$this->assertFalse($this->settings->isUsingClusterBackend());
243257

244-
$this->settings->useSentinelBackend->setValue('1');
245-
$this->assertTrue($this->settings->useSentinelBackend->getValue());
258+
$this->settings->useWhatRedisBackendType->setValue(3);
259+
$this->assertTrue($this->settings->isUsingClusterBackend());
246260
}
247261

248262
public function test_redisPort_ShouldFailWhenMultipleValuesGiven_IfSentinelNotEnabled()
@@ -290,9 +304,9 @@ public function test_queueEnabled_ShouldBeDisabledByDefault()
290304
$this->assertFalse($this->settings->queueEnabled->getValue());
291305
}
292306

293-
public function test_useSentinelBackend_ShouldBeDisabledByDefault()
307+
public function test_useWhatRedisBackendType_ShouldBe1Default()
294308
{
295-
$this->assertFalse($this->settings->useSentinelBackend->getValue());
309+
$this->assertSame(1, $this->settings->useWhatRedisBackendType->getValue());
296310
}
297311

298312
public function test_sentinelMasterName_shouldHaveValueByDefault()

0 commit comments

Comments
 (0)