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

chore: #140 - fix color flaky tests #148

Merged
merged 6 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,5 @@ dev.db

schema.graphql
*.cookie
dev.db-journal
dev.db-journal
.DS_Store
1 change: 1 addition & 0 deletions apps/ui/src/components/trace/span.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export function Span({
{displyInfo}
<div className="relative h-4 rounded-md bg-gray-400">
<div
data-line="span-line"
className={cn("absolute rounded-md h-4 bg-light-green", {
"bg-indigo-600": data.isForeign,
"bg-red": isSpanError(data),
Expand Down
5 changes: 4 additions & 1 deletion apps/ui/src/components/trace/viewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ export function TraceViewer({ trace }: { trace?: Trace }) {
}
>
<div className="px-4 pb-10">
<TraceView spans={modalSpans ?? []} id={IDS.trace_viewer.expand} />
<TraceView
spans={modalSpans ?? []}
id={IDS.trace_viewer.full_screen}
/>
</div>
</Modal>
{trace?.rootSpan ? (
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/trace-viewer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe("trace-viewer", () => {
];

for (const variant of variants) {
test.skip(variant.name, async () => {
test(variant.name, async () => {
const { dbSchema, schema, query } = await createTestSchema(variant);
const page = await getPage({ browser });
const dashboardPage = new Dashboard({
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/trace.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe("trace", () => {
];

for (const variant of variants) {
test.skip(variant.name, async () => {
test(variant.name, async () => {
const page = await getPage({ browser });
const { dbSchema, schema, query } = await createTestSchema(variant);

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/traces.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe("traces", () => {
];

for (const variant of variants) {
test.skip(variant.name, async () => {
test(variant.name, async () => {
const page = await getPage({ browser });
const { dbSchema, schema, query } = await createTestSchema(variant);

Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/utils/colors.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export const colors = {
green_text: "rgb(47, 133, 37)",
green_background: "rgba(47, 133, 37, 0.3)",
green_text: "rgb(43, 166, 119)",
green_background: "rgba(43, 166, 119, 0.3)",

red_text: "rgb(239, 67, 67)",
red_background: "rgba(239, 68, 68, 0.3)",

netural_text: "rgb(59, 76, 104)",
netural_background: "rgba(59, 75, 104, 0.3)",
netural_text: "rgb(183, 194, 215)",
netural_background: "rgba(183, 194, 215, 0.3)",
};