Skip to content

Commit cc6e9c7

Browse files
authored
fix(server): pagination sort inconsistency [VIZ-1775] (#89)
1 parent 21353e4 commit cc6e9c7

File tree

12 files changed

+1269
-165
lines changed

12 files changed

+1269
-165
lines changed

server/e2e/common.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,30 @@ func StartGQLServer(t *testing.T, cfg *config.Config, useMongo bool, seeder Seed
123123
func StartGQLServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *accountrepo.Container) {
124124
repos := initRepos(t, useMongo, seeder)
125125
acRepos := repos.AccountRepos()
126-
return StartGQLServerWithRepos(t, cfg, repos, acRepos), acRepos
126+
ctx := context.Background()
127+
return StartGQLServerWithRepos(t, ctx, cfg, repos, acRepos), acRepos
128+
}
129+
130+
func StartGQLServerRepos(t *testing.T, seeder Seeder) (*httpexpect.Expect, context.Context, *repo.Container, *accountrepo.Container) {
131+
cfg := &config.Config{
132+
Origins: []string{"https://example.com"},
133+
AuthSrv: config.AuthSrvConfig{
134+
Disabled: true,
135+
},
136+
}
137+
repos := initRepos(t, true, seeder)
138+
acRepos := repos.AccountRepos()
139+
ctx := context.Background()
140+
return StartGQLServerWithRepos(t, ctx, cfg, repos, acRepos), ctx, repos, acRepos
127141
}
128142

129-
func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Container, accountrepos *accountrepo.Container) *httpexpect.Expect {
143+
func StartGQLServerWithRepos(t *testing.T, ctx context.Context, cfg *config.Config, repos *repo.Container, accountrepos *accountrepo.Container) *httpexpect.Expect {
130144
t.Helper()
131145

132146
if testing.Short() {
133147
t.SkipNow()
134148
}
135149

136-
ctx := context.Background()
137150
l, err := net.Listen("tcp", ":0")
138151
if err != nil {
139152
t.Fatalf("server failed to listen: %v", err)

0 commit comments

Comments
 (0)