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

1 files changed, 21 insertions, 2 deletions

diff --git a/bin/test-website b/bin/test-website
index aeab459b..2e91f364 100755
--- a/bin/test-website
+++ b/bin/test-website
@@ -11,6 +11,10 @@ the root of the genenetwork2 source tree as, for example,
 
   ./bin/test-website http://localhost:5003/ (default)
 
+If you are using the small deployment database you can use
+
+  ./bin/test-website --skip -n
+
 For more information see http://genenetwork.org/
                         
 EOT
@@ -18,10 +22,20 @@ $stderr.print USAGE
 
 require 'optparse'
 
-options = {}
+options = { database: :small, link_checker: false}
 opts = OptionParser.new do |o|
   o.banner = "Usage: #{File.basename($0)} [options] URL"
   
+  o.on('-d','--database', String, 'Use database (default db_webqtl_s)') do |s|
+    options[:database] =
+      case s
+      when 'xx'
+        :unknown
+      else
+        :small
+      end
+  end
+
   o.on('-l','--link-checker', 'Check for dead links') do
     options[:link_checker] = true
   end
@@ -30,6 +44,10 @@ opts = OptionParser.new do |o|
     options[:navigation_test] = true
   end
 
+  o.on('--skip-broken', 'Skip tests that are known to be broken') do
+    options[:skip_broken] = true
+  end
+
   o.separator ""
   o.on_tail('-h', '--help', 'display this help and exit') do
     options[:show_help] = true
@@ -43,6 +61,7 @@ if options[:show_help]
   exit 1
 end
 
+$options = options  # we are using a global here
 $host = 
   if ARGV.size>0
     ARGV.shift
@@ -68,6 +87,6 @@ else
 end
   
 if options[:navigation_test]
-  require 'NavigationTest'
+  require 'navigation'
 end