Skip to content

Commit 9f679d3

Browse files
toonvandenbostoonvandenbos
committed
Fixed base tests
1 parent 4442808 commit 9f679d3

9 files changed

+80
-51
lines changed

‎src/AnalyticCookiesCategory.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,22 @@ public function google(string $id): static
1414
$this->group(function(CookiesGroup $group) use ($id) {
1515
$key = (strpos($id, 'G-') === 0) ? substr($id, 2) : $id;
1616
$group->name(static::GOOGLE_ANALYTICS)
17-
->cookie(fn(Cookie $cookie) => $cookie->name('_ga')->duration(2 * 365 * 24 * 60)->description(__('cookieConsent::cookies.defaults._ga')))
18-
->cookie(fn(Cookie $cookie) => $cookie->name('_ga_'.strtoupper($key))->duration(2 * 365 * 24 * 60)->description(__('cookieConsent::cookies.defaults._ga_ID')))
19-
->cookie(fn(Cookie $cookie) => $cookie->name('_gid')->duration(26 * 60)->description(__('cookieConsent::cookies.defaults._gid')))
20-
->cookie(fn(Cookie $cookie) => $cookie->name('_gat')->duration(1)->description(__('cookieConsent::cookies.defaults._gat')))
17+
->cookie(fn(Cookie $cookie) => $cookie->name('_ga')
18+
->duration(2 * 365 * 24 * 60)
19+
->description(__('cookieConsent::cookies.defaults._ga'))
20+
)
21+
->cookie(fn(Cookie $cookie) => $cookie->name('_ga_'.strtoupper($key))
22+
->duration(2 * 365 * 24 * 60)
23+
->description(__('cookieConsent::cookies.defaults._ga_ID'))
24+
)
25+
->cookie(fn(Cookie $cookie) => $cookie->name('_gid')
26+
->duration(26 * 60)
27+
->description(__('cookieConsent::cookies.defaults._gid'))
28+
)
29+
->cookie(fn(Cookie $cookie) => $cookie->name('_gat')
30+
->duration(1)
31+
->description(__('cookieConsent::cookies.defaults._gat'))
32+
)
2133
->accepted(function(Consent $consent) use ($id) {
2234
$consent->script('<script async src="https://www.googletagmanager.com/gtag/js?id='.$id.'"></script>')
2335
->script('<script>window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag(\'js\',new Date());gtag(\'config\',\''.$id.'\');</script>');

‎tests/Feature/FacadeTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

33
use Whitecube\LaravelCookieConsent\CookiesRegistrar;
4-
use Whitecube\LaravelCookieConsent\OperationalCookiesCategory;
4+
use Whitecube\LaravelCookieConsent\EssentialCookiesCategory;
55
use Whitecube\LaravelCookieConsent\Facades\Cookies;
66

77
it('transfers method calls to the registrar', function() {
8-
Cookies::operational()->csrf();
9-
Cookies::operational()->name('foo')->duration(120);
8+
Cookies::essentials()->csrf();
9+
Cookies::essentials()->name('foo')->duration(120);
1010

1111
expect($categories = app(CookiesRegistrar::class)->getCategories())->toHaveLength(1);
12-
expect($category = $categories[0])->toBeInstanceOf(OperationalCookiesCategory::class);
13-
expect($category->getCookies())->toHaveLength(2);
12+
expect($category = $categories[0])->toBeInstanceOf(EssentialCookiesCategory::class);
13+
expect($category->getCookies())->toHaveLength(3);
1414
});

‎tests/Feature/ServiceProviderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

33
use Whitecube\LaravelCookieConsent\CookiesRegistrar;
4-
use Whitecube\LaravelCookieConsent\OperationalCookiesCategory;
4+
use Whitecube\LaravelCookieConsent\EssentialCookiesCategory;
55

66
it('provides the cookies registrar singleton', function() {
7-
app(CookiesRegistrar::class)->operational()->csrf();
7+
app(CookiesRegistrar::class)->essentials()->csrf();
88

99
expect($categories = app(CookiesRegistrar::class)->getCategories())->toHaveLength(1);
10-
expect($category = $categories[0])->toBeInstanceOf(OperationalCookiesCategory::class);
11-
expect($category->getCookies())->toHaveLength(1);
10+
expect($category = $categories[0])->toBeInstanceOf(EssentialCookiesCategory::class);
11+
expect($category->getCookies())->toHaveLength(2);
1212
});

‎tests/Pest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
|
1212
*/
1313

14-
require_once(__DIR__ . '/PhpUnitTestCase.php');
1514
require_once(__DIR__ . '/OrchestraTestCase.php');
1615

17-
uses(Tests\PhpUnitTestCase::class)->in('Unit');
16+
uses(Tests\OrchestraTestCase::class)->in('Unit');
1817
uses(Tests\OrchestraTestCase::class)->in('Feature');
1918

2019
/*

‎tests/Unit/AnalyticCookiesCategoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
$category = new AnalyticCookiesCategory('foo');
88

99
expect($category->google('g-foo'))->toBe($category);
10-
expect($group = ($category->getCookies()[0] ?? null))->toBeInstanceOf(CookiesGroup::class);
10+
expect($group = ($category->getDefined()[0] ?? null))->toBeInstanceOf(CookiesGroup::class);
1111

1212
expect($group->hasConsentCallback())->toBeTrue();
13-
expect($group->getCookies())->toHaveLength(2);
13+
expect($group->getCookies())->toHaveLength(4);
1414
});

‎tests/Unit/CookiesCategoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
expect($category->group(fn(CookiesGroup $group) => $group))->toBe($category);
3030

31-
$results = $category->getCookies();
31+
$results = $category->getDefined();
3232
expect($results)->toHaveLength(1);
3333
});
3434

‎tests/Unit/CookiesRegistrarTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
use Whitecube\LaravelCookieConsent\CookiesRegistrar;
44
use Whitecube\LaravelCookieConsent\CookiesCategory;
5-
use Whitecube\LaravelCookieConsent\OperationalCookiesCategory;
5+
use Whitecube\LaravelCookieConsent\EssentialCookiesCategory;
66
use Whitecube\LaravelCookieConsent\AnalyticCookiesCategory;
77

88
it('can create and access consent categories', function () {
99
$registrar = new CookiesRegistrar();
1010

11-
expect($operational = $registrar->operational())->toBeInstanceOf(OperationalCookiesCategory::class);
12-
expect($operational->key())->toBe('operational');
11+
expect($essentials = $registrar->essentials())->toBeInstanceOf(EssentialCookiesCategory::class);
12+
expect($essentials->key())->toBe('essentials');
1313

1414
expect($analytics = $registrar->analytics())->toBeInstanceOf(AnalyticCookiesCategory::class);
1515
expect($analytics->key())->toBe('analytics');
@@ -44,13 +44,13 @@
4444

4545
it('can return all defined consent categories', function() {
4646
$registrar = new CookiesRegistrar();
47-
$registrar->operational();
47+
$registrar->essentials();
4848
$registrar->category('custom');
4949
$registrar->analytics();
5050

5151
$results = $registrar->getCategories();
5252
expect($results)->toHaveLength(3);
53-
expect($results[0]->key())->toBe('operational');
53+
expect($results[0]->key())->toBe('essentials');
5454
expect($results[1]->key())->toBe('custom');
5555
expect($results[2]->key())->toBe('analytics');
5656
});

‎tests/Unit/EssentialCookiesCategoryTest.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
use Whitecube\LaravelCookieConsent\Cookie;
4+
use Whitecube\LaravelCookieConsent\EssentialCookiesCategory;
5+
use Illuminate\Support\Facades\Config;
6+
7+
it('can register consent cookie', function () {
8+
Config::shouldReceive('get')->with('app.locale')->andReturn('en');
9+
Config::shouldReceive('get')->with('app.fallback_locale')->andReturn('en');
10+
Config::shouldReceive('get')->once()->with('cookieconsent.cookie.name')->andReturn('foo_consent');
11+
Config::shouldReceive('get')->once()->with('cookieconsent.cookie.duration')->andReturn(365 * 24 * 60);
12+
13+
$category = new EssentialCookiesCategory('foo');
14+
15+
expect($category->consent())->toBe($category);
16+
expect($cookie = ($category->getCookies()[0] ?? null))->toBeInstanceOf(Cookie::class);
17+
expect($cookie->name)->toBe('foo_consent');
18+
expect($cookie->duration)->toBe(365 * 24 * 60);
19+
});
20+
21+
it('can register session cookie', function () {
22+
Config::shouldReceive('get')->with('app.locale')->andReturn('en');
23+
Config::shouldReceive('get')->with('app.fallback_locale')->andReturn('en');
24+
Config::shouldReceive('get')->once()->with('session.cookie')->andReturn('foo_session');
25+
Config::shouldReceive('get')->once()->with('session.lifetime')->andReturn(120);
26+
27+
$category = new EssentialCookiesCategory('foo');
28+
29+
expect($category->session())->toBe($category);
30+
expect($cookie = ($category->getCookies()[0] ?? null))->toBeInstanceOf(Cookie::class);
31+
expect($cookie->name)->toBe('foo_session');
32+
expect($cookie->duration)->toBe(120);
33+
});
34+
35+
it('can register csrf cookie', function () {
36+
Config::shouldReceive('get')->with('app.locale')->andReturn('en');
37+
Config::shouldReceive('get')->with('app.fallback_locale')->andReturn('en');
38+
Config::shouldReceive('get')->once()->with('session.lifetime')->andReturn(120);
39+
40+
$category = new EssentialCookiesCategory('foo');
41+
42+
expect($category->csrf())->toBe($category);
43+
expect($cookie = ($category->getCookies()[0] ?? null))->toBeInstanceOf(Cookie::class);
44+
expect($cookie->name)->toBe('XSRF-TOKEN');
45+
expect($cookie->duration)->toBe(120);
46+
});

‎tests/Unit/OperationalCookiesCategoryTest.php

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)