Fix conflict

2 files changed, 55 insertions, 0 deletions

diff --git a/bin/test-website b/bin/test-website
index 2585b465..aeab459b 100755
--- a/bin/test-website
+++ b/bin/test-website
@@ -25,6 +25,10 @@ opts = OptionParser.new do |o|
   o.on('-l','--link-checker', 'Check for dead links') do
     options[:link_checker] = true
   end
+  
+  o.on('-n','--navigation-test', 'Check for navigation test results') do
+    options[:navigation_test] = true
+  end
 
   o.separator ""
   o.on_tail('-h', '--help', 'display this help and exit') do
@@ -62,3 +66,8 @@ if options[:link_checker]
 else
   require 'main_web_functionality'
 end
+  
+if options[:navigation_test]
+  require 'NavigationTest'
+end
+
diff --git a/test/lib/NavigationTest.rb b/test/lib/NavigationTest.rb
new file mode 100644
index 00000000..26080d28
--- /dev/null
+++ b/test/lib/NavigationTest.rb
@@ -0,0 +1,46 @@
+# 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
+
+describe NavigationTest do
+  before do
+    @agent = Mechanize.new
+    @agent.agent.http.ca_file = '/etc/ssl/certs/ca-certificates.crt'
+  end
+
+  describe NavigationTest do
+    it "pyLMM mapping tool selection" do
+      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')
+      page = link.click
+      puts page.uri
+      link = page.link_with(text: 'Compute')
+      page = link.click
+      puts page.uri
+      probe_link.uri.to_s.must_equal "/marker_regression"
+      
+       
+        end
+      end
+
+end
+
+describe NavigationTest do
+    it "R/qtl mapping tool selection" do
+      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
+      puts page.uri
+      form.field_with(:name => 'Methods').options[2].select
+      link = page.link_with(text: 'Compute')
+      page = link.click
+      puts page.uri
+      probe_link.uri.to_s.must_equal "/marker_regression"
+      
+       
+        end
+      end
+
+