From e68e6d458a71fee667b1e881b8aadd2eb198a10b Mon Sep 17 00:00:00 2001
From: Isaak <iyt2@cornell.edu>
Date: Thu, 5 Sep 2024 15:23:26 +0200
Subject: [PATCH] reorder selenium tests

---
 t/selenium2/solgs/correlation.t | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/t/selenium2/solgs/correlation.t b/t/selenium2/solgs/correlation.t
index 0434e0bc0c..e8c54c7e7e 100644
--- a/t/selenium2/solgs/correlation.t
+++ b/t/selenium2/solgs/correlation.t
@@ -78,8 +78,30 @@ $d->while_logged_in_as("submitter", sub {
     $d->find_element_ok('coefficients', 'partial_link_text',  'download corr coef table'); 
     sleep(2);
 
+
+    `rm -r $cache_dir`;
+    sleep(3);
+
+    ########## trial detail page ##########
+    $d->get_ok('/breeders/trial/139', 'trial detail home page');
+    sleep(5);
+    my $analysis_tools = $d->find_element('Analysis Tools', 'partial_link_text', 'toogle analysis tools');
+    my $elem = $d->driver->execute_script( "arguments[0].scrollIntoView(true);window.scrollBy(0,-50);", $analysis_tools);
+    sleep(5);
+    $d->find_element_ok('Analysis Tools', 'partial_link_text', 'toogle analysis tools')->click();
+    sleep(5);
+    $d->find_element_ok('Phenotypic correlation', 'partial_link_text', 'expand correlation')->click();
+    sleep(1);
+    $d->find_element_ok('run_correlation', 'id', 'run correlation')->click();
+    sleep(200);
+    $d->find_element_ok('//div[@id="corr_canvas"]//*[contains(text(), "DMCP")]', 'xpath', 'check corr plot -- trial detail page')->click();
+    sleep(5);
+    $d->find_element_ok('coefficients', 'partial_link_text',  'download corr coef table');
+    sleep(2);
+
     `rm -r $cache_dir`;
 
+    ########## solGS ##########
     $d->get('/solgs', 'solgs home page');
     sleep(3);
     $d->find_element_ok('population_search_entry', 'id', 'population search form')->send_keys('Kasese solgs trial');
@@ -370,26 +392,7 @@ $d->while_logged_in_as("submitter", sub {
     $d->find_element_ok('coefficients', 'partial_link_text',  'download corr coef table');
     sleep(2);
 
-    `rm -r $cache_dir`;
-    sleep(3);
-
-    $d->get_ok('/breeders/trial/139', 'trial detail home page');
-    sleep(5);
-    my $analysis_tools = $d->find_element('Analysis Tools', 'partial_link_text', 'toogle analysis tools');
-    my $elem = $d->driver->execute_script( "arguments[0].scrollIntoView(true);window.scrollBy(0,-50);", $analysis_tools);
-    sleep(5);
-    $d->find_element_ok('Analysis Tools', 'partial_link_text', 'toogle analysis tools')->click();
-    sleep(5);
-    $d->find_element_ok('Phenotypic correlation', 'partial_link_text', 'expand correlation')->click();
-    sleep(1);
-    $d->find_element_ok('run_correlation', 'id', 'run correlation')->click();
-    sleep(200);
-    $d->find_element_ok('//div[@id="corr_canvas"]//*[contains(text(), "DMCP")]', 'xpath', 'check corr plot -- trial detail page')->click();
-    sleep(5);
-    $d->find_element_ok('coefficients', 'partial_link_text',  'download corr coef table');
-    sleep(2);
    
-
     foreach my $list_id ($trials_list_id,  $plots_list_id) {
         $list_id =~ s/\w+_//g;
         $solgs_data->delete_list($list_id);
-- 
2.11.4.GIT