Merge branch 'main' into fix-credit-card-auto-fill

Author: burak-58

.github/workflows/build-and-deploy.yml

@@ -241,9 +241,20 @@ jobs:
       - name: Debug WAR file paths
         run: ls -alh /tmp
 
+      - name: Install latest Google Chrome
+        run: |
+          wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg
+          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
+          sudo apt-get update
+          sudo apt-get install -y google-chrome-stable
+
+      - name: Check Chrome version
+        run: google-chrome --version
+
       - name: Install Selenium
         run: |
-          wget https://storage.googleapis.com/chrome-for-testing-public/132.0.6834.110/linux64/chromedriver-linux64.zip
+          LATEST_VERSION=$(curl -s https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json | jq -r '.channels.Stable.version')
+          wget https://storage.googleapis.com/chrome-for-testing-public/${LATEST_VERSION}/linux64/chromedriver-linux64.zip      
           unzip chromedriver-linux64.zip
           sudo cp chromedriver-linux64/chromedriver /tmp
           ls -al /tmp
@@ -305,9 +316,20 @@ jobs:
       - name: Debug WAR file paths
         run: ls -alh /tmp
 
+      - name: Install latest Google Chrome
+        run: |
+          wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg
+          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
+          sudo apt-get update
+          sudo apt-get install -y google-chrome-stable
+
+      - name: Check Chrome version
+        run: google-chrome --version
+
       - name: Install Selenium
         run: |
-          wget https://storage.googleapis.com/chrome-for-testing-public/132.0.6834.110/linux64/chromedriver-linux64.zip
+          LATEST_VERSION=$(curl -s https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json | jq -r '.channels.Stable.version')
+          wget https://storage.googleapis.com/chrome-for-testing-public/${LATEST_VERSION}/linux64/chromedriver-linux64.zip      
           unzip chromedriver-linux64.zip
           sudo cp chromedriver-linux64/chromedriver /tmp
           ls -al /tmp

react/src/__tests__/pages/AntMedia.test.js

@@ -3815,6 +3815,33 @@ describe('AntMedia Component', () => {
 
     consoleSpy.mockRestore();
   });
+
+  describe('checkAndTurnOffLocalCamera', () => {
+    it('should call webRTCAdaptor.turnOffLocalCamera with the correct stream id', async () => {
+      const { container } = render(
+        <AntMedia isTest={true}>
+          <MockChild/>
+        </AntMedia>
+      );
+
+      await waitFor(() => {
+        expect(webRTCAdaptorConstructor).not.toBe(undefined);
+      });
+
+      currentConference.isMyMicMuted = false;
+      await act(async () => {
+        currentConference.setPublishStreamId('test-stream-id');
+      });
+
+      // Call the function
+      await act(async () => {
+        currentConference.checkAndTurnOffLocalCamera();
+      });
+
+      // Assertion: only check the observable side effect
+      expect(webRTCAdaptorConstructor.turnOffLocalCamera).toHaveBeenCalledWith('test-stream-id');
+    });
+  });
 });
 
 

react/src/pages/AntMedia.js

@@ -2946,11 +2946,7 @@ function AntMedia(props) {
     }
 
     function checkAndTurnOffLocalCamera(streamId) {
-        if (isVideoEffectRunning) {
-            webRTCAdaptor?.turnOffEffectCamera();
-        } else {
             webRTCAdaptor?.turnOffLocalCamera(publishStreamId);
-        }
 
         updateUserStatusMetadata(isMyMicMuted, false);
         setIsMyCamTurnedOff(true);

test/browser.py

@@ -105,7 +105,7 @@ def get_element_with_retry(self, by, value, retries=5, wait_time=2):
             else:
                 print(f"Element not found by {by} with value {value} after {retries} attempts: {e}")
                 #print("SS as base64: \n"+self.driver.get_screenshot_as_base64())
-                self.save_ss_as_file("not-found.png")
+                self.save_ss_as_file(value+"not-found.png")
 
                 raise