From c917ab50574b9d735f3dd8621759f581b194f0d9 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Mon, 15 Feb 2016 22:40:30 +0000 Subject: [PATCH 1/4] Upgraded hitchreqs.txt (decorator version specified was taken down off pypi) --- {{cookiecutter.repo_name}}/tests/hitchreqs.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index 219304faf..9428b3a3e 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -1,6 +1,7 @@ +backports-abc==0.4 click==6.2 colorama==0.3.6 -decorator==4.0.7 +decorator==4.0.9 docopt==0.6.2 faketime==0.9.6.3 hitchcron==0.2 @@ -16,6 +17,8 @@ humanize==0.5.1 ipython==4.1.1 ipython-genutils==0.1.0 Jinja2==2.8 +jupyter-client==4.1.1 +jupyter-core==4.0.6 MarkupSafe==0.23 path.py==8.1.2 patool==1.12 @@ -24,12 +27,13 @@ pickleshare==0.6 psutil==3.4.2 ptyprocess==0.5.1 pykwalify==1.5.0 -python-build==0.2.12 +python-build==0.2.13 python-dateutil==2.4.2 pyuv==1.2.0 PyYAML==3.11 +pyzmq==15.2.0 requests==2.9.1 -selenium==2.51.1 +selenium==2.52.0 simplegeneric==0.8.1 six==1.10.0 tblib==1.2.0 From a5e127b9a1eddda1910846beaa572134fcf40d36 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Mon, 15 Feb 2016 22:45:43 +0000 Subject: [PATCH 2/4] Shrink window size when running selenium tests to something smaller and easier to view. --- {{cookiecutter.repo_name}}/tests/all.settings | 2 +- {{cookiecutter.repo_name}}/tests/engine.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/all.settings b/{{cookiecutter.repo_name}}/tests/all.settings index 0dcdb77c0..0c3965603 100644 --- a/{{cookiecutter.repo_name}}/tests/all.settings +++ b/{{cookiecutter.repo_name}}/tests/all.settings @@ -13,7 +13,7 @@ environment_variables: DJANGO_EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend window_size: width: 1024 - height: 768 + height: 600 python_version: {% if cookiecutter.use_python2 == 'n' %}3.5.0{% else %}2.7.10{% endif %} environment: - approved_platforms: diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index 6b7b63b9a..d9efd6023 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -102,7 +102,7 @@ class ExecutionEngine(hitchtest.ExecutionEngine): self.click_and_dont_wait_for_page_load = self.webapp.click_and_dont_wait_for_page_load # Configure selenium driver - self.driver.set_window_size(self.settings['window_size']['height'], self.settings['window_size']['width']) + self.driver.set_window_size(self.settings['window_size']['width'], self.settings['window_size']['height']) self.driver.set_window_position(0, 0) self.driver.implicitly_wait(2.0) self.driver.accept_next_alert = True From 4490d08659e8066c2e58e1c01e70dddf72302ab1 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Mon, 15 Feb 2016 22:46:07 +0000 Subject: [PATCH 3/4] Remove click: djHideToolBarButton step and put it in load_website. --- {{cookiecutter.repo_name}}/tests/engine.py | 1 + {{cookiecutter.repo_name}}/tests/register-and-log-in.test | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index d9efd6023..fa6b2b658 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -118,6 +118,7 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def load_website(self): """Navigate to website in Firefox.""" self.driver.get(self.services['Django'].url()) + self.click("djHideToolBarButton") def fill_form(self, **kwargs): """Fill in a form with id=value.""" diff --git a/{{cookiecutter.repo_name}}/tests/register-and-log-in.test b/{{cookiecutter.repo_name}}/tests/register-and-log-in.test index 14655dcda..971c9a6b8 100644 --- a/{{cookiecutter.repo_name}}/tests/register-and-log-in.test +++ b/{{cookiecutter.repo_name}}/tests/register-and-log-in.test @@ -1,7 +1,6 @@ - name: Sign up and log in scenario: - Load website - - Click: djHideToolBarButton - Click: sign-up-link - Fill form: id_username: testuser From 47c3fa749b71d826595c84965c42e8c0b220e38a Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Mon, 15 Feb 2016 22:54:02 +0000 Subject: [PATCH 4/4] Make hitch tests pause on success in TDD mode. --- {{cookiecutter.repo_name}}/tests/tdd.settings | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.repo_name}}/tests/tdd.settings b/{{cookiecutter.repo_name}}/tests/tdd.settings index 08e1df714..0d88ededc 100644 --- a/{{cookiecutter.repo_name}}/tests/tdd.settings +++ b/{{cookiecutter.repo_name}}/tests/tdd.settings @@ -6,3 +6,4 @@ failfast: true pause_on_failure: true +pause_on_success: true \ No newline at end of file