Merge pull request #412 from seleniumbase/update-pytest-discovery-rules

Update pytest discovery rules

Author: mdmintz

README.md

@@ -1,4 +1,4 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb4.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 [<img src="https://img.shields.io/github/release/seleniumbase/SeleniumBase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/releases) [<img src="https://dev.azure.com/seleniumbase/seleniumbase/_apis/build/status/seleniumbase.SeleniumBase?branchName=master" alt=" " />](https://dev.azure.com/seleniumbase/seleniumbase/_build/latest?definitionId=1&branchName=master) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt=" " />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt=" " />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/stargazers)
 

examples/swag_labs_suite.py

@@ -13,8 +13,8 @@ def login(self, user="standard_user"):
         self.update_text("#user-name", user)
         self.update_text("#password", "secret_sauce")
         self.click('input[type="submit"]')
-        self.assert_text("Products", "div.product_label")
         self.assert_element("#inventory_container")
+        self.assert_text("Products", "div.product_label")
 
     @parameterized.expand([
         ["standard_user"],

examples/test_swag_labs.py

@@ -0,0 +1,70 @@
+from seleniumbase import BaseCase
+
+
+class SwagLabsTests(BaseCase):
+
+    def login(self, user="standard_user"):
+        """ Login to Swag Labs and assert that the login was successful. """
+        if user not in (["standard_user", "problem_user"]):
+            raise Exception("Invalid user!")
+        self.open("https://www.saucedemo.com/")
+        self.update_text("#user-name", user)
+        self.update_text("#password", "secret_sauce")
+        self.click('input[type="submit"]')
+        self.assert_element("#inventory_container")
+        self.assert_text("Products", "div.product_label")
+
+    def test_swag_labs_basic_flow(self):
+        """ This test checks for basic functional flow in the Swag Labs store.
+            The test is parameterized, and receives the user to use for login.
+        """
+        self.login()
+
+        # Verify that the "Test.allTheThings() T-Shirt" appears on the page
+        item_name = "Test.allTheThings() T-Shirt"
+        self.assert_text(item_name)
+
+        # Verify that a reverse-alphabetical sort works as expected
+        self.select_option_by_value("select.product_sort_container", "za")
+        if item_name not in self.get_text("div.inventory_item"):
+            raise Exception('Sort Failed! Expecting "%s" on top!' % item_name)
+
+        # Add the "Test.allTheThings() T-Shirt" to the cart
+        self.assert_exact_text("ADD TO CART", "button.btn_inventory")
+        item_price = self.get_text("div.inventory_item_price")
+        self.click("button.btn_inventory")
+        self.assert_exact_text("REMOVE", "button.btn_inventory")
+        self.assert_exact_text("1", "span.shopping_cart_badge")
+
+        # Verify your cart
+        self.click("#shopping_cart_container path")
+        self.assert_exact_text("Your Cart", "div.subheader")
+        self.assert_text(item_name, "div.inventory_item_name")
+        self.assert_exact_text("1", "div.cart_quantity")
+        self.assert_exact_text("REMOVE", "button.cart_button")
+        self.assert_element("link=CONTINUE SHOPPING")
+
+        # Checkout - Add info
+        self.click("link=CHECKOUT")
+        self.assert_exact_text("Checkout: Your Information", "div.subheader")
+        self.assert_element("a.cart_cancel_link")
+        self.update_text("#first-name", "SeleniumBase")
+        self.update_text("#last-name", "Rocks")
+        self.update_text("#postal-code", "01720")
+
+        # Checkout - Overview
+        self.click("input.btn_primary")
+        self.assert_exact_text("Checkout: Overview", "div.subheader")
+        self.assert_element("link=CANCEL")
+        self.assert_text(item_name, "div.inventory_item_name")
+        self.assert_text(item_price, "div.inventory_item_price")
+        self.assert_exact_text("1", "div.summary_quantity")
+
+        # Finish Checkout and verify item is no longer in cart
+        self.click("link=FINISH")
+        self.assert_exact_text("THANK YOU FOR YOUR ORDER", "h2")
+        self.assert_element("div.pony_express")
+        self.click("#shopping_cart_container path")
+        self.assert_element_absent("div.inventory_item_name")
+        self.click("link=CONTINUE SHOPPING")
+        self.assert_element_absent("span.shopping_cart_badge")

help_docs/customizing_test_runs.md

@@ -1,8 +1,8 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_m.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
-### Customizing test runs with **pytest** (or nosetests)
+## <img src="https://cdn2.hubspot.net/hubfs/100006/images/super_square_logo_3a.png" title="SeleniumBase" height="32"> Customizing test runs
 
-In addition to [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py) (which lets you customize SeleniumBase global properties) you can customize test runs from the command line:
+In addition to [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py) (which lets you customize SeleniumBase global properties) you can customize test runs from the command line with pytest (or nosetests):
 
 * Choose the browser for tests to use (Default: Chrome)
 * Choose betweeen pytest & nose unittest runners

help_docs/features_list.md

@@ -1,7 +1,7 @@
 [<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 <a id="feature_list"></a>
-## <img src="https://cdn2.hubspot.net/hubfs/100006/images/super_square_logo_3a.png" title="SeleniumBase" height="32"> **SeleniumBase Features:**
+## <img src="https://cdn2.hubspot.net/hubfs/100006/images/super_square_logo_3a.png" title="SeleniumBase" height="32"> **Features:**
 * A complete test automation framework for building & running reliable testing scripts.
 * Uses [Pytest](https://docs.pytest.org/en/latest/) and [Nose](http://nose.readthedocs.io/en/latest/) runners for test discovery, organization, execution, and logging.
 * Includes [console scripts](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/console_scripts/ReadMe.md) that save you time by installing web drivers automatically, etc. 

pytest.ini

@@ -6,6 +6,13 @@ addopts = --capture=no --ignore conftest.py -p no:cacheprovider
 # Ignore warnings such as DeprecationWarning and pytest.PytestUnknownMarkWarning
 filterwarnings = ignore::pytest.PytestWarning
 
+# Set pytest discovery rules:
+# (Most of the rules here are similar to the default rules.)
+# (unittest.TestCase rules override the rules here for classes and functions.)
+python_files = test_*.py *_test.py *_tests.py *_suite.py
+python_classes = Test* *Test* *Test *Tests *Suite
+python_functions = test_*
+
 # Here are the pytest markers used in the example tests:
 # (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
 # (Future versions of pytest may turn those marker warnings into errors.)

seleniumbase/console_scripts/sb_mkdir.py

@@ -55,6 +55,16 @@ def main():
         data.append("addopts = --capture=no --ignore conftest.py "
                     "-p no:cacheprovider")
         data.append("filterwarnings = ignore::pytest.PytestWarning")
+        data.append("python_files = test_*.py *_test.py *_tests.py *_suite.py")
+        data.append("python_classes = Test* *Test* *Test *Tests *Suite")
+        data.append("python_functions = test_*")
+        data.append("markers =")
+        data.append("    marker1: custom marker")
+        data.append("    marker2: custom marker")
+        data.append("    marker3: custom marker")
+        data.append("    marker_test_suite: custom marker")
+        data.append("    expected_failure: custom marker")
+        data.append("")
         file_path = "%s/%s" % (dir_name, "pytest.ini")
         file = codecs.open(file_path, "w+", "utf-8")
         file.writelines("\r\n".join(data))

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.32.20',
+    version='1.32.21',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',