Merge https://github.com/zsloan/genenetwork

Resolved conflicts:
	wqflask/base/trait.py
	wqflask/wqflask/correlation/correlationFunction.py
	wqflask/wqflask/correlation/correlation_function.py
	wqflask/wqflask/correlation/correlation_functions.py
	wqflask/wqflask/correlation/show_corr_results.py

1 files changed, 74 insertions, 0 deletions

diff --git a/webtests/browser_run.py b/webtests/browser_run.py
new file mode 100644
index 00000000..2ec299c5
--- /dev/null
+++ b/webtests/browser_run.py
@@ -0,0 +1,74 @@
+from __future__ import absolute_import, division, print_function
+
+__all__ = ('sleep', 'testmod', 'test')
+
+from doctest import testmod
+
+from time import sleep
+
+import selenium
+from selenium import webdriver
+from selenium.common.exceptions import NoSuchElementException, ElementNotVisibleException
+from selenium.webdriver.common.keys import Keys
+
+class Test(object):
+    def __init__(self):
+        #self.browser = webdriver.Chrome('/home/gn2/gn2/webtests/chromedriver')
+        self.browser = webdriver.Firefox()
+
+    def get(self, url):
+        self.browser.get(url)
+        sleep(5)
+        self.title()
+
+    def click(self, xpath_selector):
+        el = self.browser.find_element_by_xpath(xpath_selector)
+        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)
+
+    def click_option(self, xpath_selector, option_text):
+        el = self.browser.find_element_by_xpath(xpath_selector)
+        for option in el.find_elements_by_tag_name('option'):
+            if option.text == option_text:
+                option.click() # select() in earlier versions of webdriver
+                break
+        sleep(2)
+
+    def enter_text(self, xpath_selector, text):
+        el = self.browser.find_element_by_xpath(xpath_selector)
+        sleep(10)
+        el.send_keys(text)
+        sleep(5)
+        # Just in case things get mangled by JavaScript, etc. we print the text for testing
+        self.get_text(xpath_selector)
+
+    def get_text(self, xpath_selector):
+        el = self.browser.find_element_by_xpath(xpath_selector)
+        text = el.text.strip() or el.get_attribute("value").strip()
+        print("text:", text)
+        
+    def get_element_style(self, xpath_selector):
+        el = self.browser.find_element_by_xpath(xpath_selector)
+        style = el.get_attribute("style").strip()
+        print("style:", style)
+
+    def switch_window(self):
+        self.browser.switch_to_window(self.browser.window_handles[-1])
+        sleep(2)
+        self.title()
+        sleep(2)
+
+
+    def title(self):
+        print("title:", self.browser.title)
+
+
+
+test = Test()
\ No newline at end of file