Merge branch 'master' into 4232-slow-pipes-n-jobs

[arvados.git] / apps / workbench / test / performance_test_helper.rb

diff --git a/apps/workbench/test/performance_test_helper.rb b/apps/workbench/test/performance_test_helper.rb
index 7c4035406b40302e91b7c2e2f0148b4aace1fbff..1b6a1a61dd52881dd4e98f82ebe434f0cd9fc1e0 100644 (file)
--- a/apps/workbench/test/performance_test_helper.rb
+++ b/apps/workbench/test/performance_test_helper.rb
@@ -1,20 +1,21 @@
 require 'integration_helper'
 
-# Performance test can run in two two different ways:
+# Performance test can run in two different ways:
 #
 # 1. Similar to other integration tests using the command:
 #     RAILS_ENV=test bundle exec rake test:benchmark
 #
 # 2. Against a configured workbench url using "RAILS_ENV=performance".
-#     RAILS_ENV=performance bundle exec rake TEST=test/performance/*.rb
+#     RAILS_ENV=performance bundle exec rake test:benchmark
 
 class WorkbenchPerformanceTest < ActionDispatch::PerformanceTest
 
-  # When running in "RAILS_ENV=performance" mode, uses performance config params.
-  # In this mode, prepends workbench URL to the given path provided,
-  # and visits that page using the configured "user_token".
+  # When running in "RAILS_ENV=performance" mode, uses performance
+  # config params.  In this mode, prepends workbench URL to the given
+  # path provided, and visits that page using the configured
+  # "user_token".
   def visit_page_with_token path='/'
-    if ENV["RAILS_ENV"].eql? 'performance'
+    if Rails.env == 'performance'
       token = Rails.configuration.user_token
       workbench_url = Rails.configuration.arvados_workbench_url
       if workbench_url.end_with? '/'
@@ -28,9 +29,4 @@ class WorkbenchPerformanceTest < ActionDispatch::PerformanceTest
     visit page_with_token(token, (workbench_url + path))
   end
 
-  # We do not want to reset the database fixtures in "RAILS_ENV=performance" mode.
-  protected
-  def self.reset_api_fixtures_now
-  end
-
 end