archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 19:14:04 +00:00
Code Activity

Fix #31 CacheManager didn't merge tags properly; write tests for CacheManager

Browse source
This commit is contained in:
Samuel Štancl 2019-02-13 17:13:01 +01:00
parent e463829e53
commit a2d68b1261
3 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/CacheManager.php
View file

@ -11,11 +11,14 @@ class CacheManager extends BaseCacheManager
$tags = [config('tenancy.cache.tag_base') . tenant('uuid')]; $tags = [config('tenancy.cache.tag_base') . tenant('uuid')];
if ($method === "tags") { if ($method === "tags") {
if (count($parameters) == 1 && is_array($parameters[0])) { if (count($parameters) !== 1) {
$parameters = [$parameters]; // cache()->tags('foo') https://laravel.com/docs/5.7/cache#removing-tagged-cache-items throw new \Exception("Method tags() takes exactly 1 argument. {count($parameters)} passed.");
} }
return $this->store()->tags(array_merge($tags, ...$parameters)); $names = $parameters[0];
$names = (array) $names; // cache()->tags('foo') https://laravel.com/docs/5.7/cache#removing-tagged-cache-items
return $this->store()->tags(array_merge($tags, $names));
} }
return $this->store()->tags($tags)->$method(...$parameters); return $this->store()->tags($tags)->$method(...$parameters);

8
tests/BootstrapsTenancyTest.php
View file

@ -65,8 +65,10 @@ class BootstrapsTenancyTest extends TestCase
/** @test */ /** @test */
public function cache_is_tagged() public function cache_is_tagged()
{ {
$this->markTestIncomplete('see BootstrapsTenancyTest@cache_is_tagged'); $this->assertSame(['foo'], cache()->tags('foo')->getTags()->getNames());
// todo check that tags are set $this->initTenancy();
// doesn't seem to be possible right now? can't find a way to get TaggedCache's tags
$expected = [config('tenancy.cache.tag_base') . tenant('uuid'), 'foo', 'bar'];
$this->assertEquals($expected, cache()->tags(['foo', 'bar'])->getTags()->getNames());
} }
} }

22
tests/CacheManagerTest.php
View file

@ -7,18 +7,34 @@ class CacheManagerTest extends TestCase
/** @test */ /** @test */
public function default_tag_is_automatically_applied() public function default_tag_is_automatically_applied()
{ {
$this->markTestIncomplete('see BootstrapsTenancyTest@cache_is_tagged'); $this->assertArraySubset([config('tenancy.cache.tag_base') . tenant('uuid')], cache()->tags('foo')->getTags()->getNames());
} }
/** @test */ /** @test */
public function tags_are_merged_when_array_is_passed() public function tags_are_merged_when_array_is_passed()
{ {
$this->markTestIncomplete('see BootstrapsTenancyTest@cache_is_tagged'); $expected = [config('tenancy.cache.tag_base') . tenant('uuid'), 'foo', 'bar'];
$this->assertEquals($expected, cache()->tags(['foo', 'bar'])->getTags()->getNames());
} }
/** @test */ /** @test */
public function tags_are_merged_when_string_is_passed() public function tags_are_merged_when_string_is_passed()
{ {
$this->markTestIncomplete('see BootstrapsTenancyTest@cache_is_tagged'); $expected = [config('tenancy.cache.tag_base') . tenant('uuid'), 'foo'];
$this->assertEquals($expected, cache()->tags('foo')->getTags()->getNames());
}
/** @test */
public function exception_is_thrown_when_zero_arguments_are_passed_to_tags_method()
{
$this->expectException(\Exception::class);
cache()->tags();
}
/** @test */
public function exception_is_thrown_when_more_than_one_argument_is_passed_to_tags_method()
{
$this->expectException(\Exception::class);
cache()->tags(1, 2);
} }
} }