Home Explore Help
Register Sign In
aahmad
/
groupe3
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

TVT - résolution de conflits

TVernet 1 year ago
parent
0dd4f9f3e4 583f069628
commit
4215ff7775
3 changed files with 19 additions and 12 deletions
Split View Show Diff Stats
  1. 1 2
      .gitignore
  2. 12 0
      RapporDeTest_groupe3.html
  3. 6 10
      test_saucedemo.py

+ 1 - 2
.gitignore
View File 

@@ -1,2 +1 @@
 
-.pytest_cache
 
-.mypy_cache
 
+__pycache__

+ 12 - 0
rapporDeTest.html → RapporDeTest_groupe3.html
View File 

@@ -328,7 +328,11 @@ div.media {
 
   </head>
 
   <body>
 
     <h1 id="title">rapporDeTest.html</h1>
 
+<<<<<<< HEAD:rapporDeTest.html
 
     <p>Report generated on 11-Jan-2024 at 10:08:05 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
 
+=======
 
+    <p>Report generated on 11-Jan-2024 at 10:13:59 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
 
+>>>>>>> 583f0696289e24f22cc7ef7fee74d7d5e1eabd7a:RapporDeTest_groupe3.html
 
         v4.1.1</p>
 
     <div id="environment-header">
 
       <h2>Environment</h2>
 
@@ -382,7 +386,11 @@ div.media {
 
         <h2>Summary</h2>
 
         <div class="additional-summary prefix">
 
         </div>
 
+<<<<<<< HEAD:rapporDeTest.html
 
         <p class="run-count">1 test took 00:00:24.</p>
 
+=======
 
+        <p class="run-count">1 test took 00:00:13.</p>
 
+>>>>>>> 583f0696289e24f22cc7ef7fee74d7d5e1eabd7a:RapporDeTest_groupe3.html
 
         <p class="filter">(Un)check the boxes to filter the results.</p>
 
         <div class="summary__reload">
 
           <div class="summary__reload__button hidden" onclick="location.reload()">
 
@@ -429,7 +437,11 @@ div.media {
 
     </table>
 
   </body>
 
   <footer>
 
+<<<<<<< HEAD:rapporDeTest.html
 
     <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.11.3&#34;, &#34;Platform&#34;: &#34;Windows-10-10.0.22631-SP0&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;7.4.4&#34;, &#34;pluggy&#34;: &#34;1.3.0&#34;}, &#34;Plugins&#34;: {&#34;anyio&#34;: &#34;4.2.0&#34;, &#34;html&#34;: &#34;4.1.1&#34;, &#34;metadata&#34;: &#34;3.0.0&#34;}}, &#34;tests&#34;: {&#34;test_saucedemo.py::test_loginOK&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Passed&#34;, &#34;testId&#34;: &#34;test_saucedemo.py::test_loginOK&#34;, &#34;duration&#34;: &#34;00:00:24&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Passed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;test_saucedemo.py::test_loginOK&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;00:00:24&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;------------------------------ Captured log call -------------------------------\nINFO     root:test_saucedemo.py:16 Test du Login avec succ\u00e8s\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;rapporDeTest.html&#34;}"></div>
 
+=======
 
+    <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.12.1&#34;, &#34;Platform&#34;: &#34;Windows-10-10.0.19045-SP0&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;7.4.4&#34;, &#34;pluggy&#34;: &#34;1.3.0&#34;}, &#34;Plugins&#34;: {&#34;html&#34;: &#34;4.1.1&#34;, &#34;metadata&#34;: &#34;3.0.0&#34;}}, &#34;tests&#34;: {&#34;test_saucedemo.py::test_loginOK&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Passed&#34;, &#34;testId&#34;: &#34;test_saucedemo.py::test_loginOK&#34;, &#34;duration&#34;: &#34;00:00:13&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Passed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;test_saucedemo.py::test_loginOK&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;00:00:13&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;------------------------------ Captured log call -------------------------------\nINFO     root:test_saucedemo.py:15 Test du Login avec succ\u00e8s\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;rapporDeTest.html&#34;}"></div>
 
+>>>>>>> 583f0696289e24f22cc7ef7fee74d7d5e1eabd7a:RapporDeTest_groupe3.html
 
     <script>
 
       (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
 const { getCollapsedCategory, setCollapsedIds } = require('./storage.js')

+ 6 - 10
test_saucedemo.py
View File 

@@ -11,28 +11,24 @@ def writeInInput(inputElement, text):
 
     inputElement.clear()
 
     inputElement.send_keys(text)
 
 
-
 
 def test_loginOK():
 
     log.info("Test du Login avec succès")
 
     options = webdriver.FirefoxOptions()
 
-    options.add_argument("--headless")
 
+    options.add_argument('--headless')
 
 
     driver = webdriver.Firefox(options=options)
 
     driver.get("https://www.saucedemo.com/")
 
-    assert (
 
-        driver.current_url == "https://www.saucedemo.com/"
 
-    ), "Nous ne somme pas sur la bonne page"
 
+    assert driver.current_url == "https://www.saucedemo.com/", "Nous ne somme pas sur la bonne page"
 
 
-    username = driver.find_element(By.ID, "user-name")
 
-    password = driver.find_element(By.ID, "password")
 
+    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="standard_user")
 
     writeInInput(password, text="secret_sauce")
 
     login.click()
 
 
-    assert (
 
-        driver.current_url == "https://www.saucedemo.com/inventory.html"
 
-    ), "Nous ne somme pas sur la bonne page"
 
+    assert driver.current_url == "https://www.saucedemo.com/inventory.html", "Nous ne somme pas sur la bonne page"
 
 
     driver.quit()
 
+