Merge pull request #253 from acrellin/firefox

Use Firefox instead of Chrome in frontend tests

Author: stefanv

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "baselayer"]
 	path = baselayer
 	url = git://github.com/cesium-ml/baselayer.git
-	branch = master
+	branch = firefox

.travis.yml

@@ -54,11 +54,11 @@ addons:
     - supervisor
     - nginx
     - xvfb
-    - chromium-browser
     - unzip
     - libnss3
     - libgconf-2-4
   postgresql: "9.6"
+  firefox: latest
 
 matrix:
   include:

.travis/travis_install.sh

@@ -4,6 +4,9 @@ set -ex
 
 section "install.base.requirements"
 
+# Check Firefox version
+firefox --version
+
 # Install v1.7 or newer of nginx to support 'if' statement for logging
 sudo apt-add-repository -y ppa:nginx/development
 sudo apt update
@@ -38,12 +41,12 @@ make db_init
 section_end "init.db"
 
 
-section "install.chromedriver.and.selenium"
-wget https://chromedriver.storage.googleapis.com/2.37/chromedriver_linux64.zip
-sudo unzip chromedriver_linux64.zip chromedriver -d /usr/local/bin
-rm chromedriver_linux64.zip
-which chromium-browser
-chromium-browser --version
+section "install.geckodriver.and.selenium"
+wget https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux64.tar.gz
+sudo tar -xzf geckodriver-v0.20.0-linux64.tar.gz -C /usr/local/bin
+rm geckodriver-v0.20.0-linux64.tar.gz
+which geckodriver
+geckodriver --version
 pip install --upgrade selenium
 python -c "import selenium; print(f'Selenium {selenium.__version__}')"
-section_end "install.chromedriver.and.selenium"
+section_end "install.geckodriver.and.selenium"

baselayer

@@ -160,7 +160,7 @@ def test_download_prediction_csv_class(driver, project, dataset, featureset,
     driver.get('/')
     _click_download(project.id, driver)
     matching_downloads_paths = glob.glob(f'{cfg["paths:downloads_folder"]}/'
-                                         'cesium_prediction_results*.csv')
+                                         'cesium_prediction_results*')
     assert len(matching_downloads_paths) == 1
     try:
         npt.assert_equal(
@@ -180,7 +180,7 @@ def test_download_prediction_csv_class_unlabeled(driver, project, unlabeled_pred
     driver.get('/')
     _click_download(project.id, driver)
     matching_downloads_paths = glob.glob(f'{cfg["paths:downloads_folder"]}/'
-                                         'cesium_prediction_results*.csv')
+                                         'cesium_prediction_results*')
     assert len(matching_downloads_paths) == 1
     try:
         result = np.genfromtxt(matching_downloads_paths[0], dtype='str')
@@ -196,7 +196,7 @@ def test_download_prediction_csv_class_prob(driver, project, dataset,
     driver.get('/')
     _click_download(project.id, driver)
     matching_downloads_paths = glob.glob(f'{cfg["paths:downloads_folder"]}/'
-                                         'cesium_prediction_results*.csv')
+                                         'cesium_prediction_results*')
     assert len(matching_downloads_paths) == 1
     try:
         result = pd.read_csv(matching_downloads_paths[0])
@@ -218,7 +218,7 @@ def test_download_prediction_csv_regr(driver, project, dataset, featureset,
     driver.get('/')
     _click_download(project.id, driver)
     matching_downloads_paths = glob.glob(f'{cfg["paths:downloads_folder"]}/'
-                                         'cesium_prediction_results*.csv')
+                                         'cesium_prediction_results*')
     assert len(matching_downloads_paths) == 1
     try:
         results = np.genfromtxt(matching_downloads_paths[0],

cesium_app/tests/frontend/test_predict.py

@@ -11,46 +11,55 @@ def test_tab_tooltips(driver, project):
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-0'))
     hover.perform()
-    time.sleep(0.8)
+    time.sleep(1)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Manage your projects')]"
     ).is_displayed()
 
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-2'))
     hover.perform()
-    time.sleep(0.8)
+    time.sleep(1)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Upload your time-series data')]"
         ).is_displayed()
 
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-4'))
     hover.perform()
-    time.sleep(0.8)
+    time.sleep(1)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Generate features from your time-series data')]"
     ).is_displayed()
 
 
-def test_file_upload_tooltips(driver, project):
+def test_headerfile_upload_tooltip(driver, project):
     driver.get('/')
     driver.refresh()
     driver.find_element_by_id('react-tabs-2').click()
     driver.find_element_by_partial_link_text('Upload new dataset').click()
+    time.sleep(0.2)
 
-    header_file = driver.find_element_by_css_selector('[name=headerFile]')
-    hover = ActionChains(driver).move_to_element(header_file)
+    header_file = driver.find_element_by_css_selector('[name="headerFile"]')
+    hover = ActionChains(driver).click_and_hold(header_file)
     hover.perform()
-    time.sleep(0.8)
+    time.sleep(1)
     assert driver.find_element_by_xpath(
         "//span[contains(.,'filename,label')]"
     ).is_displayed()
 
-    tar_file = driver.find_element_by_css_selector('[name=tarFile]')
-    hover = ActionChains(driver).move_to_element(tar_file)
+
+def DISABLED_test_tarfile_upload_tooltip(driver, project):
+    driver.get('/')
+    driver.refresh()
+    driver.find_element_by_id('react-tabs-2').click()
+    driver.find_element_by_partial_link_text('Upload new dataset').click()
+    time.sleep(0.2)
+
+    tar_file = driver.find_element_by_css_selector('[name="tarFile"]')
+    hover = ActionChains(driver).click_and_hold(tar_file)
     hover.perform()
-    time.sleep(0.8)
+    time.sleep(1)
     assert driver.find_element_by_xpath(
         "//span[contains(.,'Each file in tarball should be formatted as follows')]"
     ).is_displayed()

cesium_app/tests/frontend/test_tooltips.py

@@ -22,6 +22,7 @@ paths:
 
     upload_folder: './data/uploads'
     custom_feature_script_folder: './data/uploads/custom_feature_scripts'
+    downloads_folder: '/tmp'
 
 database:
     database: cesium

config.yaml.defaults

@@ -71,10 +71,12 @@ let DatasetForm = (props) => {
 
       <CesiumTooltip
         id="headerfileTooltip"
+        place="right"
         text={["filename,label", <br key={1} />, "ts1.dat,class_A", <br key={2} />, "..."]}
       />
       <CesiumTooltip
         id="tarfileTooltip"
+        place="right"
         text={[
           "Each file in tarball should be formatted as follows",
           <br />, "(column titles are optional)", <br />, <br />,

static/js/components/Datasets.jsx

@@ -20,6 +20,6 @@ CesiumTooltip.propTypes = {
 };
 CesiumTooltip.defaultProps = {
   place: 'top',
-  delay: 700
+  delay: 500
 };
 export default CesiumTooltip;