Skip to content

Commit a9d8e87

Browse files
estringanaestringana
committed
Align tests
1 parent d39860c commit a9d8e87

File tree

4 files changed

+68
-84
lines changed

4 files changed

+68
-84
lines changed

‎tests/Integrations/Laravel/V4/LoginEventsTest.php

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class LoginEventsTest extends WebFrameworkTestCase
1010
{
11-
protected $maintainSession = true;
12-
1311
protected static function getAppIndexScript()
1412
{
1513
return __DIR__ . '/../../../Frameworks/Laravel/Version_4_2/public/index.php';
@@ -41,11 +39,7 @@ public static function ddTearDownAfterClass()
4139

4240
protected function login($email)
4341
{
44-
return $this->tracesFromWebRequest(function () use ($email) {
45-
$this->call(
46-
GetSpec::create('Login success event', '/login/auth?email='.$email)
47-
);
48-
});
42+
return $this->call(GetSpec::create('Login success event', '/login/auth?email='.$email));
4943
}
5044

5145
protected function createUser($id, $name, $email) {
@@ -60,7 +54,12 @@ public function testUserLoginSuccessEvent()
6054
$email = '[email protected]';
6155
$this->createUser($id, $name, $email);
6256

63-
$this->login($email);
57+
$traces = $this->tracesFromWebRequest(function () use ($email) { $this->login($email); });
58+
59+
$meta = $traces[0][0]['meta'];
60+
$this->assertEquals($id, $meta['usr.id']);
61+
$this->assertEquals($name, $meta['usr.name']);
62+
$this->assertEquals($email, $meta['usr.email']);
6463

6564
$events = AppsecStatus::getInstance()->getEvents();
6665
$this->assertEquals(1, count($events));
@@ -73,39 +72,26 @@ public function testUserLoginSuccessEvent()
7372

7473
public function testLoggedInCalls()
7574
{
75+
$this->enableSession();
7676
$id = 1234;
7777
$name = 'someName';
7878
$email = '[email protected]';
7979
$this->createUser($id, $name, $email);
8080

8181
//First log in
82-
$traces = $this->login($email);
82+
$this->login($email);
8383

84+
//Now we are logged in lets do another call
85+
AppsecStatus::getInstance()->setDefaults(); //Remove all events
86+
$traces = $this->tracesFromWebRequest(function () { $this->call(GetSpec::create('Behind auth', '/behind_auth')); });
8487
$meta = $traces[0][0]['meta'];
8588
$this->assertEquals($id, $meta['usr.id']);
8689
$this->assertEquals($name, $meta['usr.name']);
8790
$this->assertEquals($email, $meta['usr.email']);
8891

89-
$events = AppsecStatus::getInstance()->getEvents();
90-
$this->assertEquals(1, count($events));
91-
$this->assertEquals($id, $events[0]['userId']);
92-
$this->assertEquals($name, $events[0]['metadata']['name']);
93-
$this->assertEquals($email, $events[0]['metadata']['email']);
94-
$this->assertTrue($events[0]['automated']);
95-
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
96-
97-
//Now we are logged in lets do another call
98-
AppsecStatus::getInstance()->setDefaults(); //Remove all events
99-
$traces = $this->tracesFromWebRequest(function () {
100-
$this->call(GetSpec::create('Behind auth', '/behind_auth'));
101-
});
102-
10392
$events = AppsecStatus::getInstance()->getEvents();
10493
$this->assertEquals(0, count($events)); //Auth does not generate appsec events
105-
$meta = $traces[0][0]['meta'];
106-
$this->assertEquals($id, $meta['usr.id']);
107-
$this->assertEquals($name, $meta['usr.name']);
108-
$this->assertEquals($email, $meta['usr.email']);
94+
$this->disableSession();
10995
}
11096

11197
public function testUserLoginFailureEvent()

‎tests/Integrations/Laravel/V5_7/LoginEventsTest.php

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class LoginEventsTest extends WebFrameworkTestCase
1010
{
11-
protected $maintainSession = true;
12-
1311
protected static function getAppIndexScript()
1412
{
1513
return __DIR__ . '/../../../Frameworks/Laravel/Version_5_7/public/index.php';
@@ -41,26 +39,27 @@ public static function ddTearDownAfterClass()
4139

4240
protected function login($email)
4341
{
44-
return $this->tracesFromWebRequest(function () use ($email) {
45-
$this->call(
46-
GetSpec::create('Login success event', '/login/auth?email='.$email)
47-
);
48-
});
42+
return $this->call(GetSpec::create('Login success event', '/login/auth?email='.$email));
4943
}
5044

5145
protected function createUser($id, $name, $email) {
5246
//Password is password
5347
$this->connection()->exec("insert into users (id, name, email, password) VALUES (".$id.", '".$name."', '".$email."', '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi')");
5448
}
5549

56-
public function testLoggedInCalls()
50+
public function testUserLoginSuccessEvent()
5751
{
5852
$id = 1234;
5953
$name = 'someName';
6054
$email = '[email protected]';
6155
$this->createUser($id, $name, $email);
6256

63-
$this->login($email);
57+
$traces = $this->tracesFromWebRequest(function () use ($email) { $this->login($email); });
58+
59+
$meta = $traces[0][0]['meta'];
60+
$this->assertEquals($id, $meta['usr.id']);
61+
$this->assertEquals($name, $meta['usr.name']);
62+
$this->assertEquals($email, $meta['usr.email']);
6463

6564
$events = AppsecStatus::getInstance()->getEvents();
6665
$this->assertEquals(1, count($events));
@@ -70,22 +69,29 @@ public function testLoggedInCalls()
7069
$this->assertTrue($events[0]['automated']);
7170
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
7271
}
73-
public function testUserLoginSuccessEvent()
72+
73+
public function testLoggedInCalls()
7474
{
75+
$this->enableSession();
7576
$id = 1234;
7677
$name = 'someName';
7778
$email = '[email protected]';
7879
$this->createUser($id, $name, $email);
7980

81+
//First log in
8082
$this->login($email);
8183

84+
//Now we are logged in lets do another call
85+
AppsecStatus::getInstance()->setDefaults(); //Remove all events
86+
$traces = $this->tracesFromWebRequest(function () { $this->call(GetSpec::create('Behind auth', '/behind_auth')); });
87+
$meta = $traces[0][0]['meta'];
88+
$this->assertEquals($id, $meta['usr.id']);
89+
$this->assertEquals($name, $meta['usr.name']);
90+
$this->assertEquals($email, $meta['usr.email']);
91+
8292
$events = AppsecStatus::getInstance()->getEvents();
83-
$this->assertEquals(1, count($events));
84-
$this->assertEquals($id, $events[0]['userId']);
85-
$this->assertEquals($name, $events[0]['metadata']['name']);
86-
$this->assertEquals($email, $events[0]['metadata']['email']);
87-
$this->assertTrue($events[0]['automated']);
88-
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
93+
$this->assertEquals(0, count($events)); //Auth does not generate appsec events
94+
$this->disableSession();
8995
}
9096

9197
public function testUserLoginFailureEvent()

‎tests/Integrations/Laravel/V5_8/LoginEventsTest.php

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class LoginEventsTest extends WebFrameworkTestCase
1010
{
11-
protected $maintainSession = true;
12-
1311
protected static function getAppIndexScript()
1412
{
1513
return __DIR__ . '/../../../Frameworks/Laravel/Version_5_8/public/index.php';
@@ -41,11 +39,7 @@ public static function ddTearDownAfterClass()
4139

4240
protected function login($email)
4341
{
44-
return $this->tracesFromWebRequest(function () use ($email) {
45-
$this->call(
46-
GetSpec::create('Login success event', '/login/auth?email='.$email)
47-
);
48-
});
42+
return $this->call(GetSpec::create('Login success event', '/login/auth?email='.$email));
4943
}
5044

5145
protected function createUser($id, $name, $email) {
@@ -60,7 +54,12 @@ public function testUserLoginSuccessEvent()
6054
$email = '[email protected]';
6155
$this->createUser($id, $name, $email);
6256

63-
$this->login($email);
57+
$traces = $this->tracesFromWebRequest(function () use ($email) { $this->login($email); });
58+
59+
$meta = $traces[0][0]['meta'];
60+
$this->assertEquals($id, $meta['usr.id']);
61+
$this->assertEquals($name, $meta['usr.name']);
62+
$this->assertEquals($email, $meta['usr.email']);
6463

6564
$events = AppsecStatus::getInstance()->getEvents();
6665
$this->assertEquals(1, count($events));
@@ -70,22 +69,29 @@ public function testUserLoginSuccessEvent()
7069
$this->assertTrue($events[0]['automated']);
7170
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
7271
}
72+
7373
public function testLoggedInCalls()
7474
{
75+
$this->enableSession();
7576
$id = 1234;
7677
$name = 'someName';
7778
$email = '[email protected]';
7879
$this->createUser($id, $name, $email);
7980

81+
//First log in
8082
$this->login($email);
8183

84+
//Now we are logged in lets do another call
85+
AppsecStatus::getInstance()->setDefaults(); //Remove all events
86+
$traces = $this->tracesFromWebRequest(function () { $this->call(GetSpec::create('Behind auth', '/behind_auth')); });
87+
$meta = $traces[0][0]['meta'];
88+
$this->assertEquals($id, $meta['usr.id']);
89+
$this->assertEquals($name, $meta['usr.name']);
90+
$this->assertEquals($email, $meta['usr.email']);
91+
8292
$events = AppsecStatus::getInstance()->getEvents();
83-
$this->assertEquals(1, count($events));
84-
$this->assertEquals($id, $events[0]['userId']);
85-
$this->assertEquals($name, $events[0]['metadata']['name']);
86-
$this->assertEquals($email, $events[0]['metadata']['email']);
87-
$this->assertTrue($events[0]['automated']);
88-
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
93+
$this->assertEquals(0, count($events)); //Auth does not generate appsec events
94+
$this->disableSession();
8995
}
9096

9197
public function testUserLoginFailureEvent()

‎tests/Integrations/Laravel/V8_x/LoginEventsTest.php

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class LoginEventsTest extends WebFrameworkTestCase
1010
{
11-
protected $maintainSession = true;
12-
1311
protected static function getAppIndexScript()
1412
{
1513
return __DIR__ . '/../../../Frameworks/Laravel/Version_8_x/public/index.php';
@@ -41,11 +39,7 @@ public static function ddTearDownAfterClass()
4139

4240
protected function login($email)
4341
{
44-
return $this->tracesFromWebRequest(function () use ($email) {
45-
$this->call(
46-
GetSpec::create('Login success event', '/login/auth?email='.$email)
47-
);
48-
});
42+
return $this->call(GetSpec::create('Login success event', '/login/auth?email='.$email));
4943
}
5044

5145
protected function createUser($id, $name, $email) {
@@ -60,7 +54,12 @@ public function testUserLoginSuccessEvent()
6054
$email = '[email protected]';
6155
$this->createUser($id, $name, $email);
6256

63-
$this->login($email);
57+
$traces = $this->tracesFromWebRequest(function () use ($email) { $this->login($email); });
58+
59+
$meta = $traces[0][0]['meta'];
60+
$this->assertEquals($id, $meta['usr.id']);
61+
$this->assertEquals($name, $meta['usr.name']);
62+
$this->assertEquals($email, $meta['usr.email']);
6463

6564
$events = AppsecStatus::getInstance()->getEvents();
6665
$this->assertEquals(1, count($events));
@@ -73,39 +72,26 @@ public function testUserLoginSuccessEvent()
7372

7473
public function testLoggedInCalls()
7574
{
75+
$this->enableSession();
7676
$id = 1234;
7777
$name = 'someName';
7878
$email = '[email protected]';
7979
$this->createUser($id, $name, $email);
8080

8181
//First log in
82-
$traces = $this->login($email);
82+
$this->login($email);
8383

84+
//Now we are logged in lets do another call
85+
AppsecStatus::getInstance()->setDefaults(); //Remove all events
86+
$traces = $this->tracesFromWebRequest(function () { $this->call(GetSpec::create('Behind auth', '/behind_auth')); });
8487
$meta = $traces[0][0]['meta'];
8588
$this->assertEquals($id, $meta['usr.id']);
8689
$this->assertEquals($name, $meta['usr.name']);
8790
$this->assertEquals($email, $meta['usr.email']);
8891

89-
$events = AppsecStatus::getInstance()->getEvents();
90-
$this->assertEquals(1, count($events));
91-
$this->assertEquals($id, $events[0]['userId']);
92-
$this->assertEquals($name, $events[0]['metadata']['name']);
93-
$this->assertEquals($email, $events[0]['metadata']['email']);
94-
$this->assertTrue($events[0]['automated']);
95-
$this->assertEquals('track_user_login_success_event', $events[0]['eventName']);
96-
97-
//Now we are logged in lets do another call
98-
AppsecStatus::getInstance()->setDefaults(); //Remove all events
99-
$traces = $this->tracesFromWebRequest(function () {
100-
$this->call(GetSpec::create('Behind auth', '/behind_auth'));
101-
});
102-
10392
$events = AppsecStatus::getInstance()->getEvents();
10493
$this->assertEquals(0, count($events)); //Auth does not generate appsec events
105-
$meta = $traces[0][0]['meta'];
106-
$this->assertEquals($id, $meta['usr.id']);
107-
$this->assertEquals($name, $meta['usr.name']);
108-
$this->assertEquals($email, $meta['usr.email']);
94+
$this->disableSession();
10995
}
11096

11197
public function testUserLoginFailureEvent()

0 commit comments

Comments
 (0)