Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
1c957b1
questdb submodule
glasstiger Jun 26, 2024
5928732
run maven
glasstiger Jun 26, 2024
549d078
run maven
glasstiger Jun 26, 2024
af2435f
run maven
glasstiger Jun 26, 2024
43ae6bb
run maven
glasstiger Jun 26, 2024
5780b44
run maven
glasstiger Jun 26, 2024
5b3f0d0
run maven
glasstiger Jun 26, 2024
1250d17
run maven
glasstiger Jun 26, 2024
b1f3019
run maven
glasstiger Jun 26, 2024
485b4e1
run maven
glasstiger Jun 26, 2024
f317a87
run maven
glasstiger Jun 26, 2024
958f8af
run maven
glasstiger Jun 26, 2024
d587e79
run maven
glasstiger Jun 26, 2024
de53441
run maven
glasstiger Jun 26, 2024
7777378
run maven
glasstiger Jun 26, 2024
00615f3
run maven
glasstiger Jun 26, 2024
8eee585
run maven
glasstiger Jun 26, 2024
6afdf42
run maven
glasstiger Jun 26, 2024
5c33aeb
run maven
glasstiger Jun 26, 2024
deb4c5e
tmp dir
glasstiger Jun 26, 2024
e2f9d37
tmp dir
glasstiger Jun 26, 2024
2b8db47
stop questdb instance
glasstiger Jun 26, 2024
3e78264
pom.xml
glasstiger Jun 26, 2024
ee38149
CI change
glasstiger Jun 26, 2024
2b9d4d7
CI change
glasstiger Jun 26, 2024
6c92bef
CI change
glasstiger Jun 26, 2024
3d0f45d
CI change
glasstiger Jun 26, 2024
d3642bc
CI change
glasstiger Jun 26, 2024
0021dce
CI change
glasstiger Jun 26, 2024
10a6a67
CI change
glasstiger Jun 26, 2024
47895f8
CI change
glasstiger Jun 27, 2024
1048a06
CI change
glasstiger Jun 27, 2024
6bc10ed
CI change
glasstiger Jun 27, 2024
5ecc294
CI change
glasstiger Jun 27, 2024
2d9effb
CI change
glasstiger Jun 27, 2024
58ae685
CI change
glasstiger Jun 27, 2024
78923fc
CI change
glasstiger Jun 27, 2024
f303b52
CI change
glasstiger Jun 27, 2024
d3184e3
CI change
glasstiger Jun 27, 2024
1baee8d
CI change
glasstiger Jun 27, 2024
a5bbadc
CI change
glasstiger Jun 27, 2024
663b9cc
CI change
glasstiger Jun 27, 2024
841367f
CI change
glasstiger Jun 27, 2024
99acc77
CI change
glasstiger Jun 27, 2024
04a8f05
CI change
glasstiger Jun 27, 2024
44bf675
CI change
glasstiger Jun 27, 2024
d8a0497
CI change
glasstiger Jun 27, 2024
d13b1cd
CI change
glasstiger Jun 27, 2024
d5a0f62
CI change
glasstiger Jun 27, 2024
57f57f6
CI change
glasstiger Jun 27, 2024
ecd2d80
CI change
glasstiger Jun 27, 2024
288a54d
CI change
glasstiger Jun 27, 2024
b729019
CI change
glasstiger Jun 27, 2024
d55195a
Fix: append query at the end in Example Queries
insmac Jun 27, 2024
98cdea9
CI change
glasstiger Jun 27, 2024
37a9c08
CI change
glasstiger Jun 27, 2024
8fa4150
Update tests to pass with the `appendAt: end` example query fix
insmac Jun 27, 2024
1d68c14
Merge branch 'add_submodule' of https://github.com/questdb/ui into ad…
insmac Jun 27, 2024
331e9b0
Update the scroll test
insmac Jun 27, 2024
9545a91
Bring back `F9` test suite
insmac Jun 28, 2024
2c3fb4b
Update `F9` before code
insmac Jun 28, 2024
5e8121d
Update `cy.typeQuery()`
insmac Jun 28, 2024
69149f3
Streamline test config for queryParams sheet
insmac Jun 28, 2024
5a75681
fix: cleanup after testing
insmac Jun 28, 2024
74a6c0a
Updata autocomplete tests
insmac Jun 28, 2024
17cffa9
Change autocomplete spec
insmac Jun 28, 2024
e43310f
remove skipping
insmac Jun 28, 2024
a64a1bc
script to run cypress test locally
glasstiger Jul 1, 2024
965aeb7
change external intercepts
insmac Jul 1, 2024
3db254a
Merge branch 'add_submodule' of https://github.com/questdb/ui into ad…
insmac Jul 1, 2024
f3847cd
Split the autocomplete tests
insmac Jul 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/check_oss_submodule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check OSS Submodule

on:
push:

jobs:
check_oss_submodule:
name: Check if OSS is on master
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"

- name: Check OSS branch
run: |
python3 -m pip install -U pip
python3 -m pip install --upgrade pygit2==1.14.1
python3 submodule_is_mergeable.py
43 changes: 36 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,30 @@ jobs:
CI:
name: Monorepo CI flow
runs-on: ubuntu-latest
services:
questdb:
image: questdb/questdb:nightly
ports:
- 9000:9000
env:
QDB_TELEMETRY_ENABLED: false

steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"

- uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven

- name: Build QuestDB
run: mvn clean package -f packages/browser-tests/questdb/pom.xml -DskipTests -P build-binaries

- name: Extract QuestDB
run: tar -xzf packages/browser-tests/questdb/core/target/questdb-*-rt-linux-amd64.tar.gz -C tmp/

- name: Create DB Root
run: mkdir tmp/dbroot

- name: Start QuestDB
run: ./tmp/questdb-*-rt-linux-amd64/bin/questdb.sh start -d ./tmp/dbroot

- uses: actions/setup-node@v4
with:
node-version: "20"
Expand All @@ -40,6 +54,21 @@ jobs:
- name: Run browser-tests test
run: node packages/web-console/serve-dist.js & yarn workspace browser-tests test

- name: Print Log Files
if: success() || failure()
run: cat tmp/dbroot/log/*

- name: Save QuestDB log on test failure
if: failure()
uses: actions/upload-artifact@v4
with:
name: questdb-log
path: tmp/dbroot/log/*

- name: Stop QuestDB
if: success() || failure()
run: ./tmp/questdb-*-rt-linux-amd64/bin/questdb.sh stop

- name: Publish @questdb/web-console to npm
if: github.ref == 'refs/heads/main'
uses: JS-DevTools/npm-publish@v1
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "questdb"]
path = packages/browser-tests/questdb
url = https://github.com/questdb/questdb.git
25 changes: 24 additions & 1 deletion .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
2 changes: 1 addition & 1 deletion packages/browser-tests/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const {

module.exports = defineConfig({
e2e: {
defaultCommandTimeout: 10000,
defaultCommandTimeout: 30000,
screenshotOnRunFailure: false,
video: false,
baseUrl: "http://localhost:9999",
Expand Down
30 changes: 20 additions & 10 deletions packages/browser-tests/cypress/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ const {
addMatchImageSnapshotCommand,
} = require("@simonsmith/cypress-image-snapshot/command");

require("cypress-real-events");

addMatchImageSnapshotCommand({
failureThreshold: 0.3,
blackout: [".notifications", 'button[class*="BuildVersion"'],
Expand All @@ -24,13 +26,23 @@ beforeEach(() => {
cy.intercept(
{
method: "GET",
url: "/**",
hostname: "api.github.com",
url: "/github/latest",
hostname: "github-api.questdb.io",
},
(req) => {
req.reply("{}");
}
);
cy.intercept(
{
method: "GET",
url: "/news",
hostname: "cloud.questdb.com",
},
(req) => {
req.reply("[]");
}
);
});

Cypress.Commands.add("getGrid", () =>
Expand All @@ -50,7 +62,7 @@ Cypress.Commands.add("getGridCol", (n) =>
Cypress.Commands.add("getGridRows", () => cy.get(".qg-r").filter(":visible"));

Cypress.Commands.add("typeQuery", (query) =>
cy.getEditor().click({ force: true }).type(query)
cy.getEditor().realClick().type(query)
);

Cypress.Commands.add("runLine", () => {
Expand All @@ -77,6 +89,10 @@ Cypress.Commands.add("selectQuery", (n) =>
.click()
);

Cypress.Commands.add("getMountedEditor", () =>
cy.get(".monaco-scrollable-element")
);

Cypress.Commands.add("getEditor", () => cy.get(".monaco-editor[role='code'] "));

Cypress.Commands.add("getEditorContent", () =>
Expand Down Expand Up @@ -116,13 +132,7 @@ Cypress.Commands.add("matchErrorMarkerPosition", ({ left, width }) =>

Cypress.Commands.add("F9", () => {
cy.intercept("/exec*").as("exec");
return cy
.getEditor()
.trigger("keydown", {
keyCode: 120,
})
.wait("@exec")
.wait(501);
return cy.getEditor().realPress("F9").wait("@exec").wait(501);
});

Cypress.Commands.add("getSelectedLines", () => cy.get(".selected-text"));
Expand Down
Loading