idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque.git synced 2024-11-24 17:25:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #235 from magnusp/master

Browse Source 
Resolves chrisboulton/php-resque#145
This commit is contained in:
Chris Boulton 2015-03-12 22:06:59 +11:00
commit eb7ab0c81a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Resque/Redis.php
View File

@ -98,7 +98,7 @@ class Resque_Redis
*/ */
public static function prefix($namespace) public static function prefix($namespace)
{ {
if (strpos($namespace, ':') === false) { if (substr($namespace, -1) !== ':') {
$namespace .= ':'; $namespace .= ':';
} }
self::$defaultNamespace = $namespace; self::$defaultNamespace = $namespace;

18
test/Resque/Tests/JobTest.php
View File

@ -166,7 +166,21 @@ class Resque_Tests_JobTest extends Resque_Tests_TestCase
$this->assertTrue(Test_Job_With_TearDown::$called); $this->assertTrue(Test_Job_With_TearDown::$called);
} }
public function testNamespaceNaming() {
$fixture = array(
array('test' => 'more:than:one:with:', 'assertValue' => 'more:than:one:with:'),
array('test' => 'more:than:one:without', 'assertValue' => 'more:than:one:without:'),
array('test' => 'resque', 'assertValue' => 'resque:'),
array('test' => 'resque:', 'assertValue' => 'resque:'),
);
foreach($fixture as $item) {
Resque_Redis::prefix($item['test']);
$this->assertEquals(Resque_Redis::getPrefix(), $item['assertValue']);
}
}
public function testJobWithNamespace() public function testJobWithNamespace()
{ {
Resque_Redis::prefix('php'); Resque_Redis::prefix('php');
@ -176,7 +190,7 @@ class Resque_Tests_JobTest extends Resque_Tests_TestCase
$this->assertEquals(Resque::queues(), array('jobs')); $this->assertEquals(Resque::queues(), array('jobs'));
$this->assertEquals(Resque::size($queue), 1); $this->assertEquals(Resque::size($queue), 1);
Resque_Redis::prefix('resque'); Resque_Redis::prefix('resque');
$this->assertEquals(Resque::size($queue), 0); $this->assertEquals(Resque::size($queue), 0);
} }