Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit d7fc674

Browse files
authored
Update JB integration tests after PLG sunset (#8224)
This PR adjusts JB integration tests to the recent changes (dropped dotcom support) and updates deps btw. ## Test plan - green ci <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. -->
1 parent 8d59866 commit d7fc674

File tree

7 files changed

+997
-764
lines changed

7 files changed

+997
-764
lines changed

jetbrains/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ plugins {
6060
id("java")
6161
id("jvm-test-suite")
6262
id("org.jetbrains.kotlin.jvm") version "2.2.0"
63-
id("org.jetbrains.intellij.platform") version "2.6.0"
64-
id("org.jetbrains.changelog") version "2.2.1"
65-
id("com.diffplug.spotless") version "7.0.2"
66-
id("io.sentry.jvm.gradle") version "5.2.0"
63+
id("org.jetbrains.intellij.platform") version "2.7.0"
64+
id("org.jetbrains.changelog") version "2.3.0"
65+
id("com.diffplug.spotless") version "7.2.1"
66+
id("io.sentry.jvm.gradle") version "5.8.0"
6767
}
6868

6969
val platformVersion: String by project

jetbrains/src/integrationTest/kotlin/com/sourcegraph/cody/autocomplete/AutocompleteCompletionTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AutocompleteCompletionTest : BaseAutocompleteTest() {
2626
private val fixture =
2727
BaseIntegrationTextFixture(
2828
"autocomplete",
29-
credentials = TestingCredentials.dotcom,
29+
credentials = TestingCredentials.s2,
3030
CodyAgentService.clientCapabilities.copy(
3131
globalState = ClientCapabilities.GlobalStateEnum.Stateless))
3232

jetbrains/src/integrationTest/kotlin/com/sourcegraph/cody/util/EditCodeFixture.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.junit.Assert.fail
2222
class EditCodeFixture(recordingName: String) :
2323
BaseIntegrationTextFixture(
2424
recordingName,
25-
credentials = TestingCredentials.dotcom,
25+
credentials = TestingCredentials.s2,
2626
CodyAgentService.clientCapabilities.copy(
2727
globalState = ClientCapabilities.GlobalStateEnum.Stateless)),
2828
LensListener {

jetbrains/src/integrationTest/kotlin/com/sourcegraph/cody/util/TestingCredentials.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.sourcegraph.cody.util
22

3-
import com.sourcegraph.config.ConfigUtil
4-
53
// See instructions in CONTRIBUTING.MD
64
// for how to update the `redacted` tokens when the access token changes.
75
data class TestingCredentials(
@@ -10,18 +8,6 @@ data class TestingCredentials(
108
val serverEndpoint: String
119
) {
1210
companion object {
13-
val dotcom =
14-
TestingCredentials(
15-
token = System.getenv("SRC_DOTCOM_PRO_ACCESS_TOKEN"),
16-
redactedToken =
17-
"REDACTED_fc324d3667e841181b0779375f26dedc911d26b303d23b29b1a2d7ee63dc77eb",
18-
serverEndpoint = ConfigUtil.DOTCOM_URL)
19-
val dotcomProUserRateLimited =
20-
TestingCredentials(
21-
token = System.getenv("SRC_DOTCOM_PRO_RATE_LIMIT_ACCESS_TOKEN"),
22-
redactedToken =
23-
"REDACTED_c31e1e5cbed2b06911f09e4e9766c7df227fb23b80cb364c1fe289a845667b4e",
24-
serverEndpoint = ConfigUtil.DOTCOM_URL)
2511
val enterprise =
2612
TestingCredentials(
2713
token = System.getenv("SRC_ENTERPRISE_ACCESS_TOKEN"),

jetbrains/src/integrationTest/resources/recordings/autocompleteEdit_3787598409/recording.har.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ log:
473473
params: []
474474
textJSON:
475475
query: >
476-
476+
477477
query CodeSearchEnabled {
478478
codeSearchEnabled: enterpriseLicenseHasFeature(feature:"code-search")
479479
}
@@ -575,7 +575,7 @@ log:
575575
params: []
576576
textJSON:
577577
query: |-
578-
578+
579579
query ContextFilters {
580580
site {
581581
codyContextFilters(version: V1) {
@@ -685,7 +685,7 @@ log:
685685
params: []
686686
textJSON:
687687
query: |-
688-
688+
689689
query CurrentSiteCodyLlmConfiguration {
690690
site {
691691
codyLLMConfiguration {
@@ -802,7 +802,7 @@ log:
802802
params: []
803803
textJSON:
804804
query: |-
805-
805+
806806
query CurrentSiteCodyLlmConfiguration {
807807
site {
808808
codyLLMConfiguration {
@@ -913,7 +913,7 @@ log:
913913
params: []
914914
textJSON:
915915
query: |-
916-
916+
917917
query CurrentSiteCodyLlmProvider {
918918
site {
919919
codyLLMConfiguration {
@@ -1023,7 +1023,7 @@ log:
10231023
params: []
10241024
textJSON:
10251025
query: |-
1026-
1026+
10271027
query CurrentUser {
10281028
currentUser {
10291029
id
@@ -1146,7 +1146,7 @@ log:
11461146
params: []
11471147
textJSON:
11481148
query: |-
1149-
1149+
11501150
query SiteProductVersion {
11511151
site {
11521152
productVersion
@@ -1250,7 +1250,7 @@ log:
12501250
params: []
12511251
textJSON:
12521252
query: |
1253-
1253+
12541254
query ViewerSettings {
12551255
viewerSettings {
12561256
final

0 commit comments

Comments
 (0)