diff options
| author | Zachary Sloan | 2013-08-14 17:40:55 -0500 |
|---|---|---|
| committer | Zachary Sloan | 2013-08-14 17:40:55 -0500 |
| commit | 535208e73e8c1706734c0d466a535f01991d1b4f (patch) | |
| tree | 66a27b50fd9f0a9f058b95712bebb195b86a9fc2 | |
| parent | 11c426d50ac6718e16981be603527bd569f9d11a (diff) | |
| parent | e327f27b1957ee6693986e9e9d4ff77550b16f07 (diff) | |
| download | genenetwork2-535208e73e8c1706734c0d466a535f01991d1b4f.tar.gz | |
Merge branch 'master' of https://github.com/zsloan/genenetwork
| -rw-r--r-- | webtests/browser_test.py (renamed from wqflask/maintenance/browser_test.py) | 7 | ||||
| -rwxr-xr-x | webtests/chromedriver | bin | 0 -> 17741222 bytes | |||
| -rw-r--r-- | webtests/correlation_matrix_test.py (renamed from wqflask/maintenance/correlation_matrix_test.py) | 1 | ||||
| -rw-r--r-- | webtests/correlation_test.py (renamed from wqflask/maintenance/correlation_test.py) | 0 | ||||
| -rw-r--r-- | webtests/libpeerconnection.log | 0 | ||||
| -rw-r--r-- | webtests/marker_regression_test.py (renamed from wqflask/maintenance/marker_regression_test.py) | 1 |
6 files changed, 7 insertions, 2 deletions
diff --git a/wqflask/maintenance/browser_test.py b/webtests/browser_test.py index ecf8e1ca..50e4d128 100644 --- a/wqflask/maintenance/browser_test.py +++ b/webtests/browser_test.py @@ -18,7 +18,12 @@ class Test(object): def click(self, xpath_selector): el = self.browser.find_element_by_xpath(xpath_selector) - text = el.text.strip() or el.get_attribute("value").strip() + if el.text: + text = el.text.strip() + elif el.get_attribute("value"): + text = el.get_attribute("value").strip() + else: + text = "Notext" el.click() print("clicked:", text) sleep(2) diff --git a/webtests/chromedriver b/webtests/chromedriver Binary files differnew file mode 100755 index 00000000..754eb668 --- /dev/null +++ b/webtests/chromedriver diff --git a/wqflask/maintenance/correlation_matrix_test.py b/webtests/correlation_matrix_test.py index 5f8f10e1..21051fd7 100644 --- a/wqflask/maintenance/correlation_matrix_test.py +++ b/webtests/correlation_matrix_test.py @@ -36,6 +36,7 @@ title: BXD Trait Collection Select all records >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/table/tbody/tr/td/table/tbody/tr/td/table/tbody/tr/td/a/img''') + Click Matrix >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/table/tbody/tr/td/table/tbody/tr[2]/td/table/tbody/tr/td[2]/a/img''') diff --git a/wqflask/maintenance/correlation_test.py b/webtests/correlation_test.py index aaf3f7df..aaf3f7df 100644 --- a/wqflask/maintenance/correlation_test.py +++ b/webtests/correlation_test.py diff --git a/webtests/libpeerconnection.log b/webtests/libpeerconnection.log new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/webtests/libpeerconnection.log diff --git a/wqflask/maintenance/marker_regression_test.py b/webtests/marker_regression_test.py index f4840bd7..3baf1e95 100644 --- a/wqflask/maintenance/marker_regression_test.py +++ b/webtests/marker_regression_test.py @@ -7,7 +7,6 @@ title: GeneNetwork Choose the type >>> test.click_option('''//*[@id="tissue"]''', 'Liver mRNA') -clicked: Liver mRNA Enter the Get Any >>> test.enter_text('''//*[@id="tfor"]''', 'grin2b') |