Merge pull request #15 from GetAutomaApp/10-allow-host-machine-to-run-tests-as-well

ISSUE-10 - Allow host machine to run tests

Author: AutomaStub

.github/workflows/main.yml

@@ -1,9 +1,6 @@
 name: Docker Image CI
 
 on:
-  push:
-    branches:
-      - "*"
   pull_request:
     branches:
       - "develop"

README.md

@@ -33,9 +33,15 @@ docker-compose up -d // Run httpd and chromedriver
 docker-compose run test // Run Tests in Docker
 ```
 
+# Testing on Host Machine
+```bash
+docker compose up selenium httpd -d
+```
+2. Run tests via test runner / `swift test`
+
 
 # Example
-### Start snd Stop
+### Start and Stop
 
 ```Swift
 let chromeOption = ChromeOptions(

Tests/SwiftWebDriverIntegrationTests/ChromeDriver/ChromeDriverIntegrationTestsBase.swift

@@ -17,7 +17,7 @@ protocol ChromeDriverIntegrationTests {
 }
 
 class ChromeDriverTest: ChromeDriverIntegrationTests {
-    let baseUrl: String = "http://httpd"
+    let baseUrl: String = "http://localhost"
     var testPageURL: URL {
         .init(string: "\(baseUrl)/\(page)")!
     }
@@ -26,7 +26,7 @@ class ChromeDriverTest: ChromeDriverIntegrationTests {
     var driver: WebDriver<ChromeDriver>
 
     init() async throws {
-        let driverURL = URL(string: "http://selenium:4444")!
+        let driverURL = URL(string: "http://localhost:4444")!
         let chromeOptions = ChromeOptions(args: [
             Args(.disableDevShmUsage),
             Args(.noSandbox),

Tests/SwiftWebDriverIntegrationTests/ChromeDriver/DevTools/ChromeDriverJavascriptIntegrationTests.swift

@@ -23,7 +23,7 @@ class ChromeDriverJavascriptIntegrationTests: ChromeDriverTest {
         ("sessionStorage.setItem('session', 'active'); return sessionStorage.getItem('session')", "active"),
         ("let arr = [1, 2, 3]; arr.push(4); return arr.join(',')", "1,2,3,4"),
         ("let obj = { name: 'Alice', age: 25 }; obj.age = 26; return `${obj.age}`", "26"),
-        ("document.body.innerHTML = '<p>Hello, World!</p>; return document.innerHTML", "Hello, World!"),
+        ("document.body.innerHTML = '<p>Hello, World!</p>'; return document.body.innerText", "Hello, World!"),
     ]) func executeJavascript(input: (String, String)) async throws {
         do {
             try await driver.navigateTo(url: testPageURL)

docker-compose.yml

@@ -2,17 +2,15 @@ version: '3'
 services:
   httpd:
       image: httpd
-      networks:
-        - net1
+      network_mode: host
       volumes:
           - ./TestAssets:/usr/local/apache2/htdocs/
       ports:
           - "80:80"
 
   selenium:
     image: selenium/standalone-chrome:4.2.1-20220531
-    networks:
-        - net1
+    network_mode: host
     ports:
       - 4444:4444
       - 7900:7900
@@ -25,8 +23,7 @@ services:
     volumes:
       - .:/SwiftWebDriver
     working_dir: /SwiftWebDriver
-    networks:
-        - net1
+    network_mode: host
     environment:
       SELENIUM_URL: http://localhost:4444
     tty: true
@@ -45,6 +42,3 @@ services:
   shell:
     <<: *SwiftWebDriver
     entrypoint: /bin/bash
-
-networks:
-  net1: