From bc94862a551ca8bdeff4f7f37f218aed0ba3dfd1 Mon Sep 17 00:00:00 2001
From: Allan Clements <criminosis@gmail.com>
Date: Sat, 13 Jul 2024 12:33:11 -0500
Subject: [PATCH] FIxed if condition

---
 .github/workflows/test.yml                    | 12 ++++++------
 gremlin-client/tests/integration_traversal.rs | 10 +++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12d61fe4..6b758585 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,27 +42,27 @@ jobs:
           command: fmt
           args: --all -- --check
       - name: Run cargo test with tokio
-        if: ${{ matrix.gremlin-server }} == 3.5.7
+        if: ${{ matrix.gremlin-server }} == "3.5.7"
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --manifest-path gremlin-client/Cargo.toml  --features=tokio-runtime
       - name: Run cargo test with async-std
-        if: ${{ matrix.gremlin-server }} == 3.5.7
+        if: ${{ matrix.gremlin-server }} == "3.5.7"
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --manifest-path gremlin-client/Cargo.toml --features=async-std-runtime
       # MergeV as a step doesn't exist in 3.5.x, so selectively run those tests
       - name: Run cargo test with tokio
-        if: ${{ matrix.gremlin-server }} == 3.6.5
+        if: ${{ matrix.gremlin-server }} != "3.5.7"
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --manifest-path gremlin-client/Cargo.toml  --features=tokio-runtime,merge_v_tests
+          args: --manifest-path gremlin-client/Cargo.toml  --features=tokio-runtime,merge_tests
       - name: Run cargo test with async-std
-        if: ${{ matrix.gremlin-server }} == 3.6.5
+        if: ${{ matrix.gremlin-server }} != "3.5.7"
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --manifest-path gremlin-client/Cargo.toml --features=async-std-runtime,merge_v_tests
+          args: --manifest-path gremlin-client/Cargo.toml --features=async-std-runtime,merge_tests
diff --git a/gremlin-client/tests/integration_traversal.rs b/gremlin-client/tests/integration_traversal.rs
index 1ccf1c45..84abc41e 100644
--- a/gremlin-client/tests/integration_traversal.rs
+++ b/gremlin-client/tests/integration_traversal.rs
@@ -2,6 +2,10 @@ use std::convert::TryInto;
 
 use gremlin_client::process::traversal::{traversal, Order, __};
 use gremlin_client::structure::{Cardinality, List, Map, Pop, TextP, Vertex, VertexProperty, P, T};
+
+#[cfg(feature = "merge_tests")]
+use gremlin_client::structure::Merge;
+
 use gremlin_client::utils;
 
 mod common;
@@ -20,7 +24,7 @@ fn test_simple_vertex_traversal() {
 }
 
 #[test]
-#[cfg(feature = "merge_v_tests")]
+#[cfg(feature = "merge_tests")]
 fn test_merge_v_no_options() {
     let g = traversal().with_remote(graph());
     let expected_id = 1_000i64;
@@ -65,7 +69,7 @@ fn test_merge_v_no_options() {
 }
 
 #[test]
-#[cfg(feature = "merge_v_tests")]
+#[cfg(feature = "merge_tests")]
 fn test_merge_v_options() {
     let g = traversal().with_remote(graph());
     let expected_label = "test_merge_v_options_label";
@@ -131,7 +135,7 @@ fn test_merge_v_options() {
 }
 
 #[test]
-#[cfg(feature = "merge_v_tests")]
+#[cfg(feature = "merge_tests")]
 fn test_merge_v_start_step() {
     let g = traversal().with_remote(graph());
     let expected_id = 10000i64;