diff options
-rwxr-xr-x | bin/test-website | 12 | ||||
-rw-r--r-- | test/lib/mapping.rb | 1 | ||||
-rw-r--r-- | wqflask/wqflask/templates/ctl_results.html | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/bin/test-website b/bin/test-website index c9a72a5e..be223d94 100755 --- a/bin/test-website +++ b/bin/test-website @@ -52,12 +52,12 @@ opts = OptionParser.new do |o| options[:link_checker] = true end - o.on('--navigation-test', 'Check for navigation') do - options[:navigation_test] = true + o.on('--navigation', 'Check for navigation') do + options[:navigation] = true end - o.on('--mapping-test', 'Check for mapping') do - options[:mapping_test] = true + o.on('--mapping', 'Check for mapping') do + options[:mapping] = true end o.on('--skip-broken', 'Skip tests that are known to be broken') do @@ -98,7 +98,7 @@ $: << File.join(libpath,'test/lib') require 'main_web_functionality' -if options[:all] or options[:mapping_test] +if options[:all] or options[:mapping] require 'mapping' end @@ -106,6 +106,6 @@ if options[:all] or options[:link_checker] require 'link_checker' end -if options[:all] or options[:navigation_test] +if options[:all] or options[:navigation] require 'navigation' end diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index d6a3cd7b..20e5bd40 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -36,6 +36,7 @@ describe MappingTest do json, ({'Content-Type' => 'application/x-www-form-urlencoded'})) form = page.forms_with("marker_regression")[0] + p form form.fields.select { |fld| fld.name == 'dataset' }.first.value.must_equal 'HC_M2_0606_P' form.fields.select { |fld| fld.name == 'value:BXD1' }.first.value.must_equal "15.034" end diff --git a/wqflask/wqflask/templates/ctl_results.html b/wqflask/wqflask/templates/ctl_results.html index a5cb1c08..00ccecb6 100644 --- a/wqflask/wqflask/templates/ctl_results.html +++ b/wqflask/wqflask/templates/ctl_results.html @@ -4,7 +4,7 @@ {% block content %} <!-- Start of body --> <div class="container"> <h1>CTL Results</h1> - {{(request.form['trait_list'].split(',')|length -1)}} phenotypes as input<br> + {{(request.form['trait_list'].split(',')|length)}} phenotypes as input<br> <h3>Network Figure</h3> <a href="/tmp/{{ results['imgurl1'] }}"> <img alt="Embedded Image" src="data:image/png;base64, |