From b342ec91d83e9ab169dbcf49943d12486f0ef3e1 Mon Sep 17 00:00:00 2001
From: Vivek Patel <ervicpatelwork@gmail.com>
Date: Tue, 28 Sep 2021 17:16:15 +0530
Subject: [PATCH] Fixes token generation in integration test

---
 tests/apigw/main_test.go      | 6 +++---
 tests/automation/main_test.go | 6 +++---
 tests/compose/main_test.go    | 6 +++---
 tests/federation/main_test.go | 6 +++---
 tests/reporter/main_test.go   | 6 +++---
 tests/system/main_test.go     | 8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/apigw/main_test.go b/tests/apigw/main_test.go
index 27956f91c..60c59d34d 100644
--- a/tests/apigw/main_test.go
+++ b/tests/apigw/main_test.go
@@ -98,15 +98,15 @@ func newHelper(t *testing.T) helper {
 		},
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-
 	return h
 }
 
diff --git a/tests/automation/main_test.go b/tests/automation/main_test.go
index 875dbc911..20e00e6fc 100644
--- a/tests/automation/main_test.go
+++ b/tests/automation/main_test.go
@@ -98,15 +98,15 @@ func newHelper(t *testing.T) helper {
 		},
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-
 	return h
 }
 
diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go
index eb650cc1d..5bd598236 100644
--- a/tests/compose/main_test.go
+++ b/tests/compose/main_test.go
@@ -109,15 +109,15 @@ func newHelper(t *testing.T) helper {
 		},
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-
 	return h
 }
 
diff --git a/tests/federation/main_test.go b/tests/federation/main_test.go
index 58633e7f5..6a9c1aef2 100644
--- a/tests/federation/main_test.go
+++ b/tests/federation/main_test.go
@@ -83,15 +83,15 @@ func newHelper(t *testing.T) helper {
 		},
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-
 	return h
 }
 
diff --git a/tests/reporter/main_test.go b/tests/reporter/main_test.go
index 07b60c151..2b6b2c9e6 100644
--- a/tests/reporter/main_test.go
+++ b/tests/reporter/main_test.go
@@ -121,15 +121,15 @@ func newHelper(t *testing.T) helper {
 		},
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-
 	return h
 }
 
diff --git a/tests/system/main_test.go b/tests/system/main_test.go
index 1a268b062..ef8e8a0a3 100644
--- a/tests/system/main_test.go
+++ b/tests/system/main_test.go
@@ -131,16 +131,16 @@ func newHelper(t *testing.T) helper {
 		data: mockData,
 	}
 
+	h.cUser.SetRoles(h.roleID)
+	helpers.UpdateRBAC(h.roleID)
+	h.mockPermissionsWithAccess()
+
 	var err error
 	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser)
 	if err != nil {
 		panic(err)
 	}
 
-	h.cUser.SetRoles(h.roleID)
-	helpers.UpdateRBAC(h.roleID)
-	h.mockPermissionsWithAccess()
-
 	return h
 }