Improved testing, added browser startup, removed filtering

iiLaurens · May 25, 2018 · 70c2fbd · 70c2fbd
1 parent 9c370da
commit 70c2fbd
Show file tree

Hide file tree

Showing 30 changed files with 11,533 additions and 325 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/examples/look_for_jobs.py b/examples/look_for_jobs.py
@@ -7,9 +7,8 @@
 
 import sqlite3
 from selenium.webdriver.chrome.options import Options
-from selenium import webdriver
 import os
-from urlsave.parser import Parser
+from urlsave import Parser, Browser
 from datetime import datetime
 from json import dumps
 
@@ -52,7 +51,7 @@ def create_browser_session():
 
     chrome_driver = 'c:\Windows\chromedriver.exe'
 
-    driver = webdriver.Chrome(chrome_options=chrome_options, 
+    driver = Browser(chrome_options=chrome_options, 
                               executable_path=chrome_driver)
 
     return driver
@@ -121,9 +120,15 @@ def update_db(conn, joblist):
     conn.commit()
 
 def main():
-    driver = create_browser_session()
-    joblist = get_joblist(driver)
-    driver.quit()
+    chrome_options = Options()
+    chrome_options.add_argument("--window-size=1920x1080")
+    chrome_options.add_argument("--disable-infobars")
+
+    chrome_driver = 'c:\Windows\chromedriver.exe'
+
+    with Browser(chrome_options=chrome_options, executable_path=chrome_driver) as driver:
+        joblist = get_joblist(driver)
+
 
     conn = connect_db("D:/Temp/db.sqlite")
     update_db(conn, joblist)

diff --git a/tests/jobs/filter_on_ability.txt b/tests/jobs/filter_on_ability.txt
@@ -0,0 +1,4 @@
+Save:
+    Group by: //div[@class="pokemon-info" and contains(., "Normal")]
+    Keys: /h5
+    Save: //div[@class="abilities"]/span -l
diff --git a/tests/jobs/filter_on_pure_normal.txt b/tests/jobs/filter_on_pure_normal.txt
@@ -0,0 +1,3 @@
+Save:
+    Group by: //div[@class="pokemon-info" and contains(., "Normal") and count(.//div)=1]
+    Save: /h5
diff --git a/tests/jobs/pokemon_keys_to_abilities.txt b/tests/jobs/pokemon_keys_to_abilities.txt
@@ -0,0 +1,4 @@
+Save:
+    Group by: //div[@class="pokemon-info"]
+    Keys: /h5
+    Save: //div[@class="abilities"]/span -l
diff --git a/tests/jobs/pokemon_keys_to_details.txt b/tests/jobs/pokemon_keys_to_details.txt
@@ -0,0 +1,5 @@
+Save:
+    Group by: //div[@class="pokemon-info"]
+    Keys: /h5
+    id: /p[@class="id"]
+    abilities: //div[@class="abilities"]/span
diff --git a/tests/jobs/pokemon_keys_to_numbers_no_grouping.txt b/tests/jobs/pokemon_keys_to_numbers_no_grouping.txt
@@ -0,0 +1,3 @@
+Save:
+    Keys: //div[@class="pokemon-info"]/h5
+    Save: //div[@class="pokemon-info"]/p[@class="id"]
diff --git a/tests/jobs/simple_save.txt b/tests/jobs/simple_save.txt
@@ -0,0 +1 @@
+Save: //div[@class="pokemon-info"]/h5
diff --git a/tests/jobs/simple_save_details.txt b/tests/jobs/simple_save_details.txt
@@ -0,0 +1,5 @@
+Save:
+    Group by: //div[@class="pokemon-info"]
+    name: /h5
+    id: /p[@class="id"]
+    abilities: /div[@class="abilities"]/span
diff --git a/tests/jobs/unique_abilities.txt b/tests/jobs/unique_abilities.txt
@@ -0,0 +1 @@
+Save: //div[@class="abilities"]/span -u