Skip to content

Commit

Permalink
Merge pull request #81 from pyqa/dev
Browse files Browse the repository at this point in the history
Changes to be merged from dev to master
  • Loading branch information
surevs authored Aug 29, 2019
2 parents 7db86bc + d361f82 commit 84f4b07
Show file tree
Hide file tree
Showing 17 changed files with 281 additions and 3,146 deletions.
19 changes: 5 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ language: python

matrix:
include:
- python: 2.7
- python: 3.5
- python: 3.6
- python: 3.7
Expand All @@ -18,22 +17,14 @@ addons:

before_script:
- "sudo apt-get install python-opencv"
- "flake8 prodigyqa/*.py"
- "flake8 Examples/*.py && flake8 Examples/*/*.py"
- "pycodestyle prodigyqa/*.py && pycodestyle Examples/*/*.py"
- bash chrome_driver_install.sh
# - bash chrome_driver_install.sh

script:
# - pytest Examples/samplerestapitest.py
- pytest Examples/FilesCompare/samplecomparisontest.py

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/27beb355febfbdc8cfa7
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always
# - pytest Examples/FilesCompare/samplecomparisontest.py
- "flake8 prodigyqa/*.py"
- "flake8 Examples/*.py && flake8 Examples/*/*.py"
- "pycodestyle prodigyqa/*.py && pycodestyle Examples/*/*.py"

deploy:
provider: pypi
Expand Down
73 changes: 0 additions & 73 deletions Examples/sampleemailtest.py

This file was deleted.

1 change: 1 addition & 0 deletions Examples/samplerestapitest.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

class TestClass(ApiTester):
"""Sample Test Suite."""

@pytest.mark.get
def test_get_users(self):
"""Get users from application."""
Expand Down
6 changes: 3 additions & 3 deletions Examples/samplesaucelabseleniumtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@


class Page:
"""Stored all the needed variables at one place."""

base_url = "http://www.python.org"
fb_base_url = "http://www.facebook.com"
Expand All @@ -33,8 +34,7 @@ def setup_teardown_fixture(request):
:return: NA
:rtype: NA
"""

class Setup_Teardown(BrowserActions):
class setup_teardown(BrowserActions):
def __init__(self):
"""Configuring remote web driver.
Expand All @@ -48,7 +48,7 @@ def __init__(self):
Page.access_key),
desired_capabilities=Page.desired_cap)

request.cls.st = Setup_Teardown()
request.cls.st = setup_teardown()
yield
request.cls.st.driver.quit()

Expand Down
1 change: 0 additions & 1 deletion Examples/samplespellcheckker.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class TestClass(Utilities):

def test_spell_checker(self):
"""Sample test suite."""

misspelled = self.spell_checker(PageObjects.url)
self.assertEqual(sorted(misspelled),
sorted(PageObjects.custom_words))
Loading

0 comments on commit 84f4b07

Please sign in to comment.