Skip to content

Commit 5ca5548

Browse files
jaceksanjaceksan
authored
Merge pull request #1521 from gooddata/fix/cassette-normalization-and-sorting
fix(tests): environment-agnostic cassette normalization and sorting
2 parents 19e1cc1 + fcd47aa commit 5ca5548

33 files changed

+3410
-3030
lines changed

‎packages/gooddata-fdw/tests/import_foreign_schema/fixtures/import_compute_without_restrictions.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,10 @@ interactions:
502502
type: label
503503
labels:
504504
data:
505-
- id: state
506-
type: label
507505
- id: geo__state__location
508506
type: label
507+
- id: state
508+
type: label
509509
type: attribute
510510
- attributes:
511511
areRelationsValid: true
@@ -573,18 +573,18 @@ interactions:
573573
type: attribute
574574
referenceProperties:
575575
- identifier:
576-
id: products
576+
id: customers
577577
type: dataset
578578
multivalue: false
579579
sourceColumnDataTypes: null
580580
sourceColumns: null
581581
sources:
582-
- column: product_id
582+
- column: customer_id
583583
dataType: INT
584584
isNullable: true
585585
nullValue: null
586586
target:
587-
id: product_id
587+
id: customer_id
588588
type: attribute
589589
- identifier:
590590
id: campaigns
@@ -615,28 +615,28 @@ interactions:
615615
id: date
616616
type: date
617617
- identifier:
618-
id: customers
618+
id: products
619619
type: dataset
620620
multivalue: false
621621
sourceColumnDataTypes: null
622622
sourceColumns: null
623623
sources:
624-
- column: customer_id
624+
- column: product_id
625625
dataType: INT
626626
isNullable: true
627627
nullValue: null
628628
target:
629-
id: customer_id
629+
id: product_id
630630
type: attribute
631631
tags:
632632
- Order lines
633633
title: Order lines
634634
type: NORMAL
635635
workspaceDataFilterColumns:
636-
- dataType: STRING
637-
name: wdf__state
638636
- dataType: STRING
639637
name: wdf__region
638+
- dataType: STRING
639+
name: wdf__state
640640
workspaceDataFilterReferences:
641641
- filterColumn: wdf__state
642642
filterColumnDataType: STRING
@@ -1225,18 +1225,18 @@ interactions:
12251225
type: attribute
12261226
referenceProperties:
12271227
- identifier:
1228-
id: products
1228+
id: customers
12291229
type: dataset
12301230
multivalue: false
12311231
sourceColumnDataTypes: null
12321232
sourceColumns: null
12331233
sources:
1234-
- column: product_id
1234+
- column: customer_id
12351235
dataType: INT
12361236
isNullable: true
12371237
nullValue: null
12381238
target:
1239-
id: product_id
1239+
id: customer_id
12401240
type: attribute
12411241
- identifier:
12421242
id: campaigns
@@ -1267,28 +1267,28 @@ interactions:
12671267
id: date
12681268
type: date
12691269
- identifier:
1270-
id: customers
1270+
id: products
12711271
type: dataset
12721272
multivalue: false
12731273
sourceColumnDataTypes: null
12741274
sourceColumns: null
12751275
sources:
1276-
- column: customer_id
1276+
- column: product_id
12771277
dataType: INT
12781278
isNullable: true
12791279
nullValue: null
12801280
target:
1281-
id: customer_id
1281+
id: product_id
12821282
type: attribute
12831283
tags:
12841284
- Order lines
12851285
title: Order lines
12861286
type: NORMAL
12871287
workspaceDataFilterColumns:
1288-
- dataType: STRING
1289-
name: wdf__state
12901288
- dataType: STRING
12911289
name: wdf__region
1290+
- dataType: STRING
1291+
name: wdf__state
12921292
workspaceDataFilterReferences:
12931293
- filterColumn: wdf__state
12941294
filterColumnDataType: STRING

‎packages/gooddata-fdw/tests/import_foreign_schema/fixtures/import_insights_without_restrictions.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,10 @@ interactions:
502502
type: label
503503
labels:
504504
data:
505-
- id: state
506-
type: label
507505
- id: geo__state__location
508506
type: label
507+
- id: state
508+
type: label
509509
type: attribute
510510
- attributes:
511511
areRelationsValid: true
@@ -573,18 +573,18 @@ interactions:
573573
type: attribute
574574
referenceProperties:
575575
- identifier:
576-
id: products
576+
id: customers
577577
type: dataset
578578
multivalue: false
579579
sourceColumnDataTypes: null
580580
sourceColumns: null
581581
sources:
582-
- column: product_id
582+
- column: customer_id
583583
dataType: INT
584584
isNullable: true
585585
nullValue: null
586586
target:
587-
id: product_id
587+
id: customer_id
588588
type: attribute
589589
- identifier:
590590
id: campaigns
@@ -615,28 +615,28 @@ interactions:
615615
id: date
616616
type: date
617617
- identifier:
618-
id: customers
618+
id: products
619619
type: dataset
620620
multivalue: false
621621
sourceColumnDataTypes: null
622622
sourceColumns: null
623623
sources:
624-
- column: customer_id
624+
- column: product_id
625625
dataType: INT
626626
isNullable: true
627627
nullValue: null
628628
target:
629-
id: customer_id
629+
id: product_id
630630
type: attribute
631631
tags:
632632
- Order lines
633633
title: Order lines
634634
type: NORMAL
635635
workspaceDataFilterColumns:
636-
- dataType: STRING
637-
name: wdf__state
638636
- dataType: STRING
639637
name: wdf__region
638+
- dataType: STRING
639+
name: wdf__state
640640
workspaceDataFilterReferences:
641641
- filterColumn: wdf__state
642642
filterColumnDataType: STRING
@@ -1225,18 +1225,18 @@ interactions:
12251225
type: attribute
12261226
referenceProperties:
12271227
- identifier:
1228-
id: products
1228+
id: customers
12291229
type: dataset
12301230
multivalue: false
12311231
sourceColumnDataTypes: null
12321232
sourceColumns: null
12331233
sources:
1234-
- column: product_id
1234+
- column: customer_id
12351235
dataType: INT
12361236
isNullable: true
12371237
nullValue: null
12381238
target:
1239-
id: product_id
1239+
id: customer_id
12401240
type: attribute
12411241
- identifier:
12421242
id: campaigns
@@ -1267,28 +1267,28 @@ interactions:
12671267
id: date
12681268
type: date
12691269
- identifier:
1270-
id: customers
1270+
id: products
12711271
type: dataset
12721272
multivalue: false
12731273
sourceColumnDataTypes: null
12741274
sourceColumns: null
12751275
sources:
1276-
- column: customer_id
1276+
- column: product_id
12771277
dataType: INT
12781278
isNullable: true
12791279
nullValue: null
12801280
target:
1281-
id: customer_id
1281+
id: product_id
12821282
type: attribute
12831283
tags:
12841284
- Order lines
12851285
title: Order lines
12861286
type: NORMAL
12871287
workspaceDataFilterColumns:
1288-
- dataType: STRING
1289-
name: wdf__state
12901288
- dataType: STRING
12911289
name: wdf__region
1290+
- dataType: STRING
1291+
name: wdf__state
12921292
workspaceDataFilterReferences:
12931293
- filterColumn: wdf__state
12941294
filterColumnDataType: STRING
@@ -3231,10 +3231,10 @@ interactions:
32313231
type: label
32323232
metrics:
32333233
data:
3234-
- id: revenue
3235-
type: metric
32363234
- id: amount_of_orders
32373235
type: metric
3236+
- id: revenue
3237+
type: metric
32383238
type: visualizationObject
32393239
- attributes:
32403240
areRelationsValid: true

‎packages/gooddata-pandas/tests/dataframe/fixtures/multi_index_filtered_metrics_and_label.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ interactions:
250250
type: label
251251
labels:
252252
data:
253-
- id: state
254-
type: label
255253
- id: geo__state__location
256254
type: label
255+
- id: state
256+
type: label
257257
type: attribute
258258
included:
259259
- attributes:

‎packages/gooddata-pandas/tests/dataframe/fixtures/multi_index_metrics_and_label.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ interactions:
237237
type: label
238238
labels:
239239
data:
240-
- id: state
241-
type: label
242240
- id: geo__state__location
243241
type: label
242+
- id: state
243+
type: label
244244
type: attribute
245245
included:
246246
- attributes:

‎packages/gooddata-sdk/tests/catalog/fixtures/data_sources/demo_load_and_put_declarative_data_sources.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ interactions:
7676
string:
7777
data:
7878
attributes:
79+
allowedOrigins: []
7980
earlyAccess: enableAlerting
8081
earlyAccessValues:
8182
- enableAlerting

‎packages/gooddata-sdk/tests/catalog/fixtures/data_sources/demo_put_declarative_data_sources.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ interactions:
2222
id: demo-test-ds
2323
name: demo-test-ds
2424
permissions:
25-
- assignee:
26-
id: demo2
27-
type: user
28-
name: MANAGE
2925
- assignee:
3026
id: demoGroup
3127
type: userGroup
3228
name: USE
29+
- assignee:
30+
id: demo2
31+
type: user
32+
name: MANAGE
3333
schema: demo
3434
type: POSTGRESQL
3535
url: jdbc:postgresql://postgres:5432/tiger?sslmode=prefer
@@ -58,14 +58,14 @@ interactions:
5858
name: demo-test-ds
5959
password: passw0rd
6060
permissions:
61-
- assignee:
62-
id: demo2
63-
type: user
64-
name: MANAGE
6561
- assignee:
6662
id: demoGroup
6763
type: userGroup
6864
name: USE
65+
- assignee:
66+
id: demo2
67+
type: user
68+
name: MANAGE
6969
schema: demo
7070
type: POSTGRESQL
7171
url: jdbc:postgresql://postgres:5432/tiger?sslmode=prefer
@@ -118,14 +118,14 @@ interactions:
118118
id: demo-test-ds
119119
name: demo-test-ds
120120
permissions:
121-
- assignee:
122-
id: demo2
123-
type: user
124-
name: MANAGE
125121
- assignee:
126122
id: demoGroup
127123
type: userGroup
128124
name: USE
125+
- assignee:
126+
id: demo2
127+
type: user
128+
name: MANAGE
129129
schema: demo
130130
type: POSTGRESQL
131131
url: jdbc:postgresql://postgres:5432/tiger?sslmode=prefer

0 commit comments

Comments
 (0)