Merge branch 'staging' of github.com:genenetwork/genenetwork2 into development

3 files changed, 23 insertions, 15 deletions

diff --git a/test/lib/link_checker.rb b/test/lib/link_checker.rb
index fb201887..15449144 100644
--- a/test/lib/link_checker.rb
+++ b/test/lib/link_checker.rb
@@ -24,7 +24,7 @@ describe LinkChecker do
   describe LinkChecker do
     it "Get to trait page" do
       page = @agent.get($host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P')
-      p page
+      # p page
 
       # Get to trait page for 1435395_s_at
       # form2 = show_trait_page.forms_with("trait_page")[0]
diff --git a/test/lib/main_web_functionality.rb b/test/lib/main_web_functionality.rb
index d0a32835..ec61de2d 100644
--- a/test/lib/main_web_functionality.rb
+++ b/test/lib/main_web_functionality.rb
@@ -10,10 +10,11 @@ describe MainWebFunctionality do
   end
 
   describe MainWebFunctionality do
+
     it "Get to trait page" do
       page = @agent.get($host)
       form = page.forms[1]
-      form.buttons[0].value.must_equal "Search"
+      form.buttons[0].value.must_equal "Search" # main menu is loaded
 
       # http://localhost:5003/search?species=mouse&group=BXD&type=Hippocampus+mRNA&dataset=HC_M2_0606_P&search_terms_or=&search_terms_and=MEAN%3D%2815+16%29+LRS%3D%2823+46%29&FormID=searchResult
       form.fields[2].value = "MEAN=(15 16) LRS=(23 46)"
@@ -25,19 +26,27 @@ describe MainWebFunctionality do
       probe_link = search_page.links.find { |l| l.text =~ /1435395_s_at/ }
       probe_link.uri.to_s.must_equal "/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P"
       show_trait_page = probe_link.click
-      p show_trait_page
+      # p show_trait_page
 
       # Get to trait page for 1435395_s_at
+
       form2 = show_trait_page.forms_with("trait_page")[0]
-      form2.fields[30].name.must_equal  "variance:C57BL/6J"
+      # [name: corr_dataset value: HC_M2_0606_P]
+      form2.fields.select { |fld| fld.name == 'corr_dataset' }.first.value.must_equal 'HC_M2_0606_P'
+      if $options[:database] == :small
+        form2.fields[30].name.must_equal  "value:DBA/2J"
+      else
+        form2.fields[30].name.must_equal  "variance:C57BL/6J"
+      end
       # form2.fields[30].value.must_equal "15.287"
 
       # Test every link on the page to check if it's broken or not
+      break if not $options[:link_checker]
       show_trait_page.links.each do |link|
         puts link.href
         if link.href !~ /static\/dbdoc\/Hippocampus/ and link.href !~ /glossary.html|sample_r|grits.eecs.utk.edu|correlationAnnotation.html/
-           # Fetch link, program will crash with exception if link is broken
-           linkpage = @agent.get(link.href)
+          # Fetch link, program will crash with exception if link is broken
+          linkpage = @agent.get(link.href)
           puts "Link to #{link.href} is valid, response code #{linkpage.code}"
         end
       end
diff --git a/test/lib/NavigationTest.rb b/test/lib/navigation.rb
index 26080d28..676ee90c 100644
--- a/test/lib/NavigationTest.rb
+++ b/test/lib/navigation.rb
@@ -1,5 +1,6 @@
 # In these tests we navigate from the main page to a specific trait then hit the different mapping tool buttons (In this case pylMM and r/qtl) followed by computing the results (marker regressions).
 
+
 class NavigationTest
 end
 
@@ -11,6 +12,7 @@ describe NavigationTest do
 
   describe NavigationTest do
     it "pyLMM mapping tool selection" do
+      break if $options[:skip_broken]
       page = @agent.get($host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P')
 #Navigates to http://localhost:5003/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P and clicks respective buttons.
       link = page.link_with(text: 'pyLMM')
@@ -20,15 +22,14 @@ describe NavigationTest do
       page = link.click
       puts page.uri
       probe_link.uri.to_s.must_equal "/marker_regression"
-      
-       
-        end
-      end
+    end
+  end
 
 end
 
 describe NavigationTest do
     it "R/qtl mapping tool selection" do
+      break if $options[:skip_broken]
       page = @agent.get($host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P')
       link = page.link_with(text: 'R/qtl')
       page = link.click
@@ -37,10 +38,8 @@ describe NavigationTest do
       link = page.link_with(text: 'Compute')
       page = link.click
       puts page.uri
-      probe_link.uri.to_s.must_equal "/marker_regression"
-      
-       
-        end
-      end
+      probe_link.uri.to_s.must_equal "/marker_regression" 
+    end
+end