Résolution de conflits

test_main.py

@@ -1,47 +0,0 @@
-##### IMPORT
-import pytest
-import logging as log
-import time
-from selenium import webdriver
-from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.common.exceptions import TimeoutException
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.ui import Select
-from selenium.webdriver.firefox.options import Options
-from test_saucedemo import writeInInput
-
-
-def connexion_saucedemo(username, passwd, headless="--headless"):
-    log.info("Test du Login avec succès")
-    options = webdriver.FirefoxOptions()
-    options.add_argument(headless)
-
-    driver = webdriver.Firefox(options=options)
-    driver.get("https://www.saucedemo.com/")
-
-    username = driver.find_element(By.ID, "user-name")
-    password = driver.find_element(By.ID, "password")
-    login = driver.find_element(By.ID, "login-button")
-
-    writeInInput(inputElement=username, text=username)
-    writeInInput(password, text=passwd)
-    login.click()
-    log.info("")
-
-
-##### MANEL
-
-
-##### MATTHIEU
-
-
-##### TIFF
-def test_ma_fonction():
-    connexion_saucedemo(
-        "standard_user",
-        "secret_sauce",
-    )
-    driver.find_element(By.ID, "add-to-cart-sauce-labs-bike-light")
-    log.info("Ok")