fix web merge

instrumentisto · Aug 25, 2023 · b7cd1a2 · b7cd1a2
1 parent 710a92e
commit b7cd1a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/e2e/src/object/tracks_store.rs b/e2e/src/object/tracks_store.rs
@@ -221,11 +221,15 @@ impl<T> Object<TracksStore<T>> {
                     if ({remote}) {{
                         for (track of store.tracks) {{
                             var tr = track.track;
-                            if ({live} && !track.stopped
-                                && tr.media_direction() == 0) {{
+                            if ({live} &&
+                                    !track.stopped &&
+                                    tr.media_direction() == 0)
+                            {{
                                 count++;
                             }} else if (!{live} &&
-                                (track.stopped || tr.media_direction() != 0)) {{
+                                    (track.stopped ||
+                                        tr.media_direction() != 0))
+                            {{
                                 count++;
                             }}
                         }}

diff --git a/e2e/tests/steps/track.rs b/e2e/tests/steps/track.rs
@@ -1,4 +1,4 @@
-use std::time::Duration;
+use std::{env, time::Duration};
 
 use cucumber::then;
 use medea_e2e::object::{MediaKind, MediaSourceKind};
@@ -178,7 +178,7 @@ async fn then_doesnt_have_remote_track(
     kind: String,
     partner_id: String,
 ) {
-    let live = cfg!(feature = "sfu") && !live.is_empty();
+    let live = env::var("SFU").is_ok() && !live.is_empty();
     let member = world.get_member(&id).unwrap();
     let partner_connection = member
         .connections()

diff --git a/e2e/tests/world/member.rs b/e2e/tests/world/member.rs
@@ -1,6 +1,6 @@
 //! Medea media server member representation.
 
-use std::{cell::RefCell, collections::HashMap, fmt, time::Duration};
+use std::{cell::RefCell, collections::HashMap, env, fmt, time::Duration};
 
 use derive_more::{Display, Error, From};
 use medea_e2e::{
@@ -219,7 +219,7 @@ impl Member {
     /// [`RemoteTrack`]: crate::object::remote_track::RemoteTrack
     #[must_use]
     pub fn count_of_tracks_between_members(&self, other: &Self) -> (u64, u64) {
-        if cfg!(feature = "sfu") {
+        if env::var("SFU").is_ok() {
             return (3, 3);
         }