- Updated ReadMe

- Updated Docker Compose
- Updated BaseTest

Author: sanketsmali03

README.md

@@ -278,18 +278,18 @@ Note: The ChromeDriver version must match the Chrome browser version on your mac
   set BROWSERSTACK_ACCESS_KEY=<browserstack-access-key>
   ```
 
-  Alternatively, you can also hardcode username and access_key objects in the [caps.json](resources/conf/caps/caps.json) file.
+  Alternatively, you can also hardcode username and access_key objects in the [bs.json](resources/config/bs.json) file.
 
 Note:
-- We have configured a list of test capabilities in the [caps.json](resources/conf/caps/caps.json) file. You can certainly update them based on your device / browser test requirements.
+- We have configured a list of test capabilities in the [bs.json](resources/config/bs.json) file. You can certainly update them based on your device / browser test requirements.
 - The exact test capability values can be easily identified using the [Browserstack Capability Generator](https://browserstack.com/automate/capabilities)
 
 
 ## Running Your Tests
 
 ### Run a specific test on BrowserStack
 
-In this section, we will run a single test on Chrome browser on Browserstack. To change test capabilities for this configuration, please refer to the `single` object in `caps.json` file.
+In this section, we will run a single test on Chrome browser on Browserstack. To change test capabilities for this configuration, please refer to the `single` object in `bs.json` file.
 
 - How to run the test?
 
@@ -328,7 +328,7 @@ In this section, we will run a single test on Chrome browser on Browserstack. To
 
 ### Run the entire test suite in parallel on a single BrowserStack browser
 
-In this section, we will run the tests in parallel on a single browser on Browserstack. Refer to `single` object in `caps.json` file to change test capabilities for this configuration.
+In this section, we will run the tests in parallel on a single browser on Browserstack. Refer to `single` object in `bs.json` file to change test capabilities for this configuration.
 
 - How to run the test?
 
@@ -353,7 +353,7 @@ In this section, we will run the tests in parallel on a single browser on Browse
 
 ### Run the entire test suite in parallel on multiple BrowserStack browsers
 
-In this section, we will run the tests in parallel on multiple browsers on Browserstack. Refer to the `parallel` object in `caps.json` file to change test capabilities for this configuration.
+In this section, we will run the tests in parallel on multiple browsers on Browserstack. Refer to the `parallel` object in `bs.json` file to change test capabilities for this configuration.
 
 - How to run the test?
 
@@ -378,7 +378,7 @@ In this section, we will run the tests in parallel on multiple browsers on Brows
   git clone https://github.com/browserstack/browserstack-demo-app
   ``` 
 - Please follow the README.md on the BrowserStack demo application repository to install and start the dev server on localhost.
-- In this section, we will run a single test case to test the BrowserStack Demo app hosted on your local machine i.e. localhost. Refer to the `single_local` object in `caps.json` file to change test capabilities for this configuration.
+- In this section, we will run a single test case to test the BrowserStack Demo app hosted on your local machine i.e. localhost. Refer to the `single_local` object in `bs.json` file to change test capabilities for this configuration.
 - Note: You may need to provide additional BrowserStackLocal arguments to successfully connect your localhost environment with BrowserStack infrastructure. (e.g if you are behind firewalls, proxy or VPN).
 - Further details for successfully creating a BrowserStackLocal connection can be found here:
 
@@ -425,7 +425,7 @@ In this section, we will run the tests in parallel on multiple browsers on Brows
 
 ### [Web application hosted on internal environment] Run the entire test suite in parallel on a single BrowserStack browser using BrowserStackLocal
 
-In this section, we will run the test cases to test the internally hosted website in parallel on a single browser on Browserstack. Refer to the `single_local` object in `caps.json` file to change test capabilities for this configuration.
+In this section, we will run the test cases to test the internally hosted website in parallel on a single browser on Browserstack. Refer to the `single_local` object in `bs.json` file to change test capabilities for this configuration.
 
 - How to run the test?
 
@@ -448,7 +448,7 @@ In this section, we will run the test cases to test the internally hosted websit
 
 ### [Web application hosted on internal environment] Run the entire test suite in parallel on multiple BrowserStack browser using BrowserStackLocal
 
-In this section, we will run the test cases to test the internally hosted website in parallel on multiple browsers on Browserstack. Refer to the `parallel_local` object in `caps.json` file to change test capabilities for this configuration.
+In this section, we will run the test cases to test the internally hosted website in parallel on multiple browsers on Browserstack. Refer to the `parallel_local` object in `bs.json` file to change test capabilities for this configuration.
 
 - How to run the test?
 

docker-compose.yml

@@ -1,42 +1,43 @@
 version: "3"
 services:
-
-  hub:
-    image: selenium/hub:latest
-    ports:
-      - "4444:4444"
-
-    environment:
-      GRID_MAX_SESSION: 16
-      GRID_BROWSER_TIMEOUT: 3000
-      GRID_TIMEOUT: 3000
-
   chrome:
-    image: selenium/node-chrome
-    container_name: web-automation_chrome
-    environment:
-      HUB_PORT_4444_TCP_ADDR: hub
-      HUB_PORT_4444_TCP_PORT: 4444
-      NODE_MAX_SESSION: 4
-      NODE_MAX_INSTANCES: 4
+    image: selenium/node-chrome:4.0.0
     volumes:
       - /dev/shm:/dev/shm
-    ports:
-      - "9001:5900"
+    depends_on:
+      - selenium-hub
+    environment:
+      - SE_EVENT_BUS_HOST=selenium-hub
+      - SE_EVENT_BUS_PUBLISH_PORT=4442
+      - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
+      - SCREEN_WIDTH=2880
+      - SCREEN_HEIGHT=1800
     links:
-      - hub
+      - selenium-hub:hub
+    scale: 4
 
   firefox:
-    image: selenium/node-firefox
-    container_name: web-automation_firefox
-    environment:
-      HUB_PORT_4444_TCP_ADDR: hub
-      HUB_PORT_4444_TCP_PORT: 4444
-      NODE_MAX_SESSION: 2
-      NODE_MAX_INSTANCES: 2
+    image: selenium/node-firefox:4.0.0
     volumes:
       - /dev/shm:/dev/shm
-    ports:
-      - "9002:5900"
+    depends_on:
+      - selenium-hub
+    environment:
+      - SE_EVENT_BUS_HOST=selenium-hub
+      - SE_EVENT_BUS_PUBLISH_PORT=4442
+      - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
+      - SCREEN_WIDTH=2880
+      - SCREEN_HEIGHT=1800
     links:
-      - hub
+      - selenium-hub:hub
+    scale: 4
+
+  selenium-hub:
+    image: selenium/hub:4.0.0
+    container_name: selenium-hub
+    environment:
+      - GRID_MAX_SESSION=50
+    ports:
+      - "4442:4442"
+      - "4443:4443"
+      - "4444:4444"

src/test/java/browserstack/stepdefs/BaseTest.java

@@ -151,12 +151,20 @@ private void setupLocal(DesiredCapabilities caps, JSONObject testConfigs, String
 			if(!local.isRunning()) 
 			{
 
-                UUID uuid = UUID.randomUUID();
+              /*  UUID uuid = UUID.randomUUID();
                 caps.setCapability("browserstack.localIdentifier", uuid.toString());
                options = new HashMap<String, String>();
                 options.put("key", accessKey);
                 options.put("localIdentifier", uuid.toString());
-                local.start(options);
+                local.start(options);*/
+				
+				 // You can also set an environment variable - "BROWSERSTACK_ACCESS_KEY".
+				  HashMap<String, String> bsLocalArgs = new HashMap<String, String>();
+				  bsLocalArgs.put("key", accessKey);
+
+				  // Starts the Local instance with the required arguments
+				  local.start(bsLocalArgs);
+				  
 			}
 
 		}