restructure tests

theatlantic · Jul 8, 2021 · 3f01d2d · 3f01d2d
1 parent fc258df
commit 3f01d2d
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,6 +26,6 @@ jobs:
         pip install tox tox-gh-actions
     - name: Test with tox
       run: |
-        tox -- -v --selenium=chrome-headless || \
-        tox -- -v --selenium=chrome-headless || \
-        tox -- -v --selenium=chrome-headless
+        tox -- -v2 --selenium=chrome-headless || \
+        tox -- -v2 --selenium=chrome-headless || \
+        tox -- -v2 --selenium=chrome-headless
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ dist/
 chromedriver
 chromedriver_mac64.zip
 README.html
+venv
+.venv
diff --git a/README.rst b/README.rst
@@ -27,6 +27,7 @@ You can use homebrew or manually download ``chomedriver``:
 
 2. Manually::
 
+    export PATH="$PWD:$PATH"
     export CHROMEDRIVER_VERSION=$(curl -q http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
     curl -O http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_mac64.zip
     unzip chromedriver_mac64.zip

diff --git a/runtests.py b/runtests.py
@@ -8,6 +8,11 @@
 def main():
     warnings.simplefilter("error", Warning)
 
+    warnings.filterwarnings(
+        'once',
+        message="'grappelli' defines default_app_config"
+    )
+
     # Introduced in Python 3.7
     warnings.filterwarnings(
         'ignore',
@@ -16,8 +21,7 @@ def main():
     )
 
     os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:8081-8089')
-    runtests = selenosis.RunTests(
-        "selenosis.tests.settings", "selenosis")
+    runtests = selenosis.RunTests("tests.settings", "tests")
     runtests()
 
 

diff --git a/selenosis/pytest_plugin/selenosis.py b/selenosis/pytest_plugin/selenosis.py
@@ -24,11 +24,11 @@ def __call__(self, parser, namespace, values, option_string=None):
 
         if not browsers:
             try:
-                SelenosisTestCaseBase.import_webdriver('phantomjs')
+                SelenosisTestCaseBase.import_webdriver('chrome-headless')
             except:
                 browsers = ['skip']
             else:
-                browsers = ['phantomjs']
+                browsers = ['chrome-headless']
 
         SelenosisTestCaseBase.browsers = browsers
 

diff --git a/selenosis/runner.py b/selenosis/runner.py
@@ -94,11 +94,11 @@ def __init__(self, **kwargs):
         browsers = kwargs.pop('selenium', None)
         if not browsers:
             try:
-                SelenosisTestCaseBase.import_webdriver('phantomjs')
+                SelenosisTestCaseBase.import_webdriver('chrome-headless')
             except:
                 browsers = ['skip']
             else:
-                browsers = ['phantomjs']
+                browsers = ['chrome-headless']
         SelenosisTestCaseBase.browsers = browsers
         if not DJANGO_NATIVE_TAG_SUPPORT:
             self.tags = set(kwargs.pop('tags', None) or [])
@@ -118,7 +118,7 @@ def add_arguments(cls, parser):
         parser.add_argument(
             '--selenium', action=ActionSelenosis, metavar='BROWSERS',
             help='A comma-separated list of browsers to run the Selenosis '
-                 'tests against. Defaults to "phantomjs".')
+                 'tests against. Defaults to "chrome-headless".')
         parser.add_argument(
             '--%slog-by-verbosity' % ('no-' if cls.default_log_by_verbosity else ''),
             action=('store_false' if cls.default_log_by_verbosity else 'store_false'),

diff --git a/selenosis/tests/settings.py b/selenosis/tests/settings.py
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def read(*parts):
     author_email='[email protected]',
     maintainer='Frankie Dintino',
     maintainer_email='[email protected]',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
     install_requires=['Django>=2.2',],

diff --git a/selenosis/tests/__init__.py → tests/__init__.py b/selenosis/tests/__init__.py → tests/__init__.py
diff --git a/selenosis/tests/admin.py → tests/admin.py b/selenosis/tests/admin.py → tests/admin.py
diff --git a/selenosis/tests/models.py → tests/models.py b/selenosis/tests/models.py → tests/models.py
diff --git a/tests/settings.py b/tests/settings.py
@@ -0,0 +1,4 @@
+from selenosis.settings import *  # noqa
+
+
+INSTALLED_APPS += ('tests',)  # noqa
diff --git a/selenosis/tests/test.py → tests/test.py b/selenosis/tests/test.py → tests/test.py
diff --git a/selenosis/tests/test_runner.py → tests/test_runner.py b/selenosis/tests/test_runner.py → tests/test_runner.py
diff --git a/tox.ini b/tox.ini
@@ -7,6 +7,8 @@ commands =
     python runtests.py {posargs}
 passenv = 
 deps =
+    pytest
+    pytest-django
     selenium==3.141.0
     dj22: Django>=2.2,<3.0
     dj31: Django>=3.1,<3.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		from selenosis.settings import * # noqa


		INSTALLED_APPS += ('tests',) # noqa