chore(electric): Update E2E tests to use the proxy_1 shell for migrat…

…ions (#570)
electric-sql · Oct 30, 2023 · 54136a7 · 54136a7
1 parent d6b2ec9
commit 54136a7
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 22 deletions.
diff --git a/e2e/tests/02.01_postgres_data_streams_to_satellite.lux b/e2e/tests/02.01_postgres_data_streams_to_satellite.lux
@@ -3,7 +3,7 @@
 [include _shared.luxinc]
 
 [invoke setup]
-[invoke electrify_table entries ]
+[invoke electrify_table entries]
 
 [global user_id_1=1]
 [newshell user_1_ws1]

diff --git a/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux b/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux
@@ -17,7 +17,6 @@
     BEGIN;
     CALL electric.migration_version('$migration_version');
     CREATE TABLE mtable1 (id uuid PRIMARY KEY);
-    -- CALL electric.electrify('mtable1');
     ALTER TABLE mtable1 ENABLE ELECTRIC;
     COMMIT;
     """

diff --git a/e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux b/e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux
@@ -23,7 +23,6 @@
       id UUID PRIMARY KEY,
       content VARCHAR NOT NULL
     );
-    -- CALL electric.electrify('public.items');
     ALTER TABLE public.items ENABLE ELECTRIC;
 
     INSERT INTO items(id, content) VALUES ('00000000-0000-0000-0000-000000000011', 'first item');

diff --git a/...tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux b/...tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux
@@ -8,9 +8,9 @@
 [global migration2_vsn=20230719_02]
 
 # Create two migrations with electrified tables on the server.
-[shell pg_1]
-  [invoke migrate_pg $migration1_vsn "CREATE TABLE public.foo (id TEXT PRIMARY KEY);CALL electric.electrify('public.foo');"]
-  [invoke migrate_pg $migration2_vsn "CREATE TABLE public.bar (id TEXT PRIMARY KEY);CALL electric.electrify('public.bar');"]
+[shell proxy_1]
+  [invoke migrate_pg $migration1_vsn "CREATE TABLE public.foo (id TEXT PRIMARY KEY);ALTER TABLE public.foo ENABLE ELECTRIC;"]
+  [invoke migrate_pg $migration2_vsn "CREATE TABLE public.bar (id TEXT PRIMARY KEY);ALTER TABLE public.bar ENABLE ELECTRIC;"]
 
 # Bundle the first migration on the client.
 [global client_migrations=

diff --git a/e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux b/e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux
@@ -8,9 +8,9 @@
 [global migration2_vsn=20230719_02]
 
 # Create two migrations with electrified tables on the server.
-[shell pg_1]
-  [invoke migrate_pg $migration1_vsn "CREATE TABLE public.foo (id TEXT PRIMARY KEY);CALL electric.electrify('public.foo');"]
-  [invoke migrate_pg $migration2_vsn "CREATE TABLE public.bar (id TEXT PRIMARY KEY);CALL electric.electrify('public.bar');"]
+[shell proxy_1]
+  [invoke migrate_pg $migration1_vsn "CREATE TABLE public.foo (id TEXT PRIMARY KEY);ALTER TABLE public.foo ENABLE ELECTRIC;"]
+  [invoke migrate_pg $migration2_vsn "CREATE TABLE public.bar (id TEXT PRIMARY KEY);ALTER TABLE public.bar ENABLE ELECTRIC;"]
 
 [invoke setup_client 1 "electric_1" 5133]
 

diff --git a/e2e/tests/03.13_node_satellite_can_sync_timestamps.lux b/e2e/tests/03.13_node_satellite_can_sync_timestamps.lux
@@ -4,15 +4,15 @@
 
 [invoke setup]
 
-[shell pg_1]
+[shell proxy_1]
     [local sql=
         """
         CREATE TABLE public.timestamps (
             id TEXT PRIMARY KEY,
             created_at TIMESTAMP NOT NULL,
             updated_at TIMESTAMPTZ NOT NULL
         );
-        CALL electric.electrify('public.timestamps');
+        ALTER TABLE public.timestamps ENABLE ELECTRIC;
         """]
     [invoke migrate_pg 20230823 $sql]
 

diff --git a/e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux b/e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux
@@ -4,15 +4,15 @@
 
 [invoke setup]
 
-[shell pg_1]
+[shell proxy_1]
     [local sql=
         """
         CREATE TABLE public.datetimes (
             id TEXT PRIMARY KEY,
             d DATE,
             t TIME
         );
-        CALL electric.electrify('public.datetimes');
+        ALTER TABLE public.datetimes ENABLE ELECTRIC;
         """]
     [invoke migrate_pg 20230913 $sql]
 

diff --git a/e2e/tests/03.15_node_satellite_can_sync_booleans.lux b/e2e/tests/03.15_node_satellite_can_sync_booleans.lux
@@ -4,14 +4,14 @@
 
 [invoke setup]
 
-[shell pg_1]
+[shell proxy_1]
     [local sql=
         """
         CREATE TABLE public.bools (
             id TEXT PRIMARY KEY,
             b BOOLEAN
         );
-        CALL electric.electrify('public.bools');
+        ALTER TABLE public.bools ENABLE ELECTRIC;
         """]
     [invoke migrate_pg 20230908 $sql]
 

diff --git a/e2e/tests/04.01_electric_api_returns_migrations.lux b/e2e/tests/04.01_electric_api_returns_migrations.lux
@@ -10,7 +10,6 @@
     BEGIN;
     CALL electric.migration_version('$migration_version_1');
     CREATE TABLE mtable1 (id uuid PRIMARY KEY);
-    -- CALL electric.electrify('mtable1');
     ALTER TABLE mtable1 ENABLE ELECTRIC;
     COMMIT;
     """
@@ -23,7 +22,6 @@
     BEGIN;
     CALL electric.migration_version('$migration_version_2');
     CREATE TABLE mtable2 (id uuid PRIMARY KEY);
-    -- CALL electric.electrify('mtable2');
     ALTER TABLE mtable2 ENABLE ELECTRIC;
     COMMIT;
     """

diff --git a/e2e/tests/05.05_compensations_within_same_tx_are_fine.lux b/e2e/tests/05.05_compensations_within_same_tx_are_fine.lux
@@ -3,7 +3,7 @@
 
 [invoke setup]
 
-[shell pg_1]
+[shell proxy_1]
     [local sql=
         """
         CREATE TABLE public.items (
@@ -15,8 +15,8 @@
             content TEXT NOT NULL,
             item_id TEXT REFERENCES public.items(id)
         );
-        CALL electric.electrify('public.items');
-        CALL electric.electrify('public.other_items');
+        ALTER TABLE public.items ENABLE ELECTRIC;
+        ALTER TABLE public.other_items ENABLE ELECTRIC;
         """]
     [invoke migrate_pg 11111 $sql]
 

diff --git a/e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux b/e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux
@@ -3,14 +3,15 @@
 
 [invoke setup]
 
-[shell pg_1]
+[shell proxy_1]
     [local sql=
         """
         CREATE TABLE public."camelCase" (
             id TEXT PRIMARY KEY,
             "userId" TEXT
         );
         CALL electric.electrify('public."camelCase"');
+        --ALTER TABLE public."camelCase" ENABLE ELECTRIC;
         """]
     [invoke migrate_pg 20230921 $sql]
 

diff --git a/e2e/tests/_shared.luxinc b/e2e/tests/_shared.luxinc
@@ -133,7 +133,6 @@
             intvalue_null integer,
             intvalue_null_default integer
         );
-        -- CALL electric.electrify('public.items');
         ALTER TABLE public.items ENABLE ELECTRIC;
         """]
     [invoke migrate_pg $version $sql]