Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added Document Synchronization integration tests #1805

Open
wants to merge 48 commits into
base: main
Choose a base branch
from

Commits on Jul 2, 2024

  1. merged origin/main

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    76ed7da View commit details
    Browse the repository at this point in the history
  2. spotless

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    01012b3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1d8360a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9340583 View commit details
    Browse the repository at this point in the history
  5. more progress on integration test

    they still don't pass but they are getting closer
    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    7dc23a4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9679de4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ce45bf4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0152566 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a6aa110 View commit details
    Browse the repository at this point in the history
  10. added some assertions

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    6e38115 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    78fc6bb View commit details
    Browse the repository at this point in the history
  12. removed old file

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    dfbcd8a View commit details
    Browse the repository at this point in the history
  13. addressed PR feedback

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    cfe5bda View commit details
    Browse the repository at this point in the history
  14. spotless

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    cf9e3b9 View commit details
    Browse the repository at this point in the history
  15. more cleanup on doc-sync tests

    renamed testing/requestWorkspaceDocuments -> testing/workspaceDocuments and put in some more asssertions
    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b00c265 View commit details
    Browse the repository at this point in the history
  16. turn on CODY_RECORD_IF_MISSING for integration tests

    This prevents it from spewing an error over a graphql call
    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    17f6c4b View commit details
    Browse the repository at this point in the history
  17. updated recording

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    6b575ea View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    334c13f View commit details
    Browse the repository at this point in the history
  19. spotless

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    41f126e View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    3b7590b View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    c92b9ab View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    f6e8529 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    69974f5 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    a53d1ad View commit details
    Browse the repository at this point in the history
  25. got the DocumentSynchronizationTest working again

    DocumentCodeTest is still failing
    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    34450ae View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    9ba9d00 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    1867ba9 View commit details
    Browse the repository at this point in the history
  28. spotless

    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    75a0b0a View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    dddffa7 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    bc313a0 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    98a8cbc View commit details
    Browse the repository at this point in the history
  32. added more error handling when finding repo roots

    was failing during tests
    steveyegge committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    24e83df View commit details
    Browse the repository at this point in the history
  33. Bump cody commit

    pkukielka committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    8af3bc8 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Do not list the same account twice (#1864)

    ## Test plan
    
    Add account that exists 
    1. Using settings, add the account that already exists in the list
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    748fe16 View commit details
    Browse the repository at this point in the history
  2. Do not open subscription page when updating invalid pro account token…

    … having a pro llm selected before (#1866)
    
    ## Test plan
    1. Having a pro account
    2. switch to a pro llm in the chat
    3. remove the token from the web 
    4. re-authenticate via github
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    e9e9d99 View commit details
    Browse the repository at this point in the history
  3. Add auth telemetry events (#1863)

    Closes
    https://linear.app/sourcegraph/issue/CODY-988/p1-authorization-and-log-in-log-out
    
    ## Test plan
    
    Repeat for dotcom and enterprise user account:
    
    **Scenario 1** 
    
    1. Remove all existing accounts
    2. Make sure you are redirected to the login panel
    3. Login using one of the available providers
    4. Make sure that both `cody.auth.login/clicked` and
    `cody.auth.signin.token/clicked` telemetry events were fired
    
    **Scenario 2** 
    
    1. Click on Cody status bar and choose `Manage Accounts`
    2. Click to add new account
    3. Make sure that  `cody.auth.login/clicked` was fired
    4. Fill the account details (server and token) and confirm 
    5.  Make sure that  `cody.auth.signin.token/clicked` was fired
    pkukielka authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    eb5dbd0 View commit details
    Browse the repository at this point in the history
  4. Simplify SignInWithSourcegraphPanel.kt (#1865)

    No functional changes. Features should work as before.
    
    ## Test plan
    1. Sign in panel features working
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    3b62b3a View commit details
    Browse the repository at this point in the history
  5. Show the login screen when the token is missing (#1867)

    ## Test plan
    Delete the token from the keychain externally 
    You can run a separate instance of IDE and remove the account there.
    
    1. Log in to the account
    2. Open another IDE, log in to the same account, apply, then remove the
    account, apply
    3. Switch back to the first ide
    4. Close and reopen the project
    5. Login panel visible
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ec50472 View commit details
    Browse the repository at this point in the history
  6. Minor code imporvements (#1870)

    ## Test plan
    1. `Sign In with <>` and `Get started` buttons work
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    763c249 View commit details
    Browse the repository at this point in the history
  7. Improve action discoverability by adding Cody: prefix in Search Every…

    …where (#1872)
    
    Closes
    https://linear.app/sourcegraph/issue/CODY-2130/improve-how-actions-appear-in-shiftshift-menu
    
    ## Changes
    
    I moved action properties like `text` and `description` to `plugin.xml`.
    It is just easier to edit and inspect this way.
    To be honest, Geminit 1.5 did most of the work:
    
    > Given the following plugin.xml file and properties file, please modify
    plugin.xml so each action have additional propertes `text` and
    `description` with values from properties file.
    > Additionally for every action please add such tag: `<override-text
    place="GoToAction" text="Cody: $TEXT"/>` where `$TEXT` is taken from
    properties file as well.
    > For some actions like: `<action
    id="Cody.Accounts.LogInToSourcegraphAction"
    class="com.sourcegraph.cody.config.LogInToSourcegraphAction"/>` you may
    have to change them to form such as:
    > ```
    > <action id="Cody.Accounts.LogInToSourcegraphAction"
    class="com.sourcegraph.cody.config.LogInToSourcegraphAction" text="Log
    In to Sourcegraph">
    > <override-text place="GoToAction" text="Cody: Log In to Sourcegraph"/>
    > </action>
    >```
    >
    > Please output whole content of the modified plugin.xml file.
    
    
    ## Test plan
    
    1. Hit `Shift shift`
    2. Type 'Cody:'
    
    
    ![image](https://github.com/sourcegraph/jetbrains/assets/1519649/5ffd1d07-0088-4cb6-b5c8-3894b281bbe1)
    pkukielka authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b49f1d2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f08dba3 View commit details
    Browse the repository at this point in the history
  9. Bump cody commit, add startup telemetry (#1873)

    1. Bump cody commit to include changes from
    sourcegraph/cody#4766
    2. Add startup telemetry event.
    I realised that only v2 telemetry events sent directly from IJ contains
    info about IDE version and we want to have at least one such event for
    every user IDE. Install action telemetry event would not be sufficient
    because it would not tell us anything about existing installations.
    
    Same as in sourcegraph/cody#4766
    pkukielka authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    c3526a2 View commit details
    Browse the repository at this point in the history
  10. README: fix typo (#1875)

    Add the missing value for the ollama docs
    
    ## Test plan
    
    <!-- All pull requests REQUIRE a test plan:
    https://sourcegraph.com/docs/dev/background-information/testing_principles
    
    Why does it matter?
    
    These test plans are there to demonstrate that are following industry
    standards which are important or critical for our customers.
    They might be read by customers or an auditor. There are meant be simple
    and easy to read. Simply explain what you did to ensure
    your changes are correct!
    
    Here are a non exhaustive list of test plan examples to help you:
    
    - Making changes on a given feature or component:
    - "Covered by existing tests" or "CI" for the shortest possible plan if
    there is zero ambiguity
      - "Added new tests"
    - "Manually tested" (if non trivial, share some output, logs, or
    screenshot)
    - Updating docs:
      - "previewed locally"
      - share a screenshot if you want to be thorough
    - Updating deps, that would typically fail immediately in CI if
    incorrect
      - "CI"
      - "locally tested"
    -->
    
    ![Screenshot 2024-07-03 at 12 19
    49 PM](https://github.com/sourcegraph/jetbrains/assets/68532117/bb29c397-a40e-453f-b8bf-010e169de863)
    abeatrix authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    72e484b View commit details
    Browse the repository at this point in the history
  11. Manual Stable Release (#1862)

    Our current setup produces a lot of stable releases that often are not
    unhidden eventually. That makes the QA and awaiting JB approval process
    parallel. Based on the recent experience only 1/8 releases goes public.
    That is a waste of JB approval team's time and CI time.
    
    Let's change the setup. The nightly version handling does not change but
    the default release script does not longer publish the stable version.
    Instead the separate workflow can be triggered on the specific tag that
    publishes the stable version.
    
    ## Test plan
    1. push a tag for a nightly release
    2. trigger the stable release manually
    
    to be tested once merged
    mkondratek authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    28460c5 View commit details
    Browse the repository at this point in the history
  12. Add proper groups for Cody actions (#1884)

    Closes
    https://linear.app/sourcegraph/issue/CODY-2095/organize-keymap-settings
    
    ## Changes
    
    1. Proper grouping was added for all actions in plugin.xml
    2. The same grouping is used for nice visual organisation of keymap
    management
    
    ## Test plan
    
    Visual verification in `Settings > Keymap` (see screenshots):
    
    
    ![image](https://github.com/sourcegraph/jetbrains/assets/1519649/b5292cfb-5a2f-47ae-9706-512fb2675b8a)
    
    ![image](https://github.com/sourcegraph/jetbrains/assets/1519649/5553077a-c21e-4003-b1c8-0c2f279f6467)
    pkukielka authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    75f3406 View commit details
    Browse the repository at this point in the history
  13. Bump cody commit, adjust agent launch params (#1887)

    ## Test plan
    
    Full QA according to a test plan.
    As for launch script args change that is covered by automatic tests.
    pkukielka authored and steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    a670b86 View commit details
    Browse the repository at this point in the history
  14. updated recording

    steveyegge committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    9d5fa88 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d1d43f3 View commit details
    Browse the repository at this point in the history