summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-24 14:30:41 +0100
committerAzul <azul@riseup.net>2016-05-02 08:28:45 -0300
commit931748ab96aea54e123b0fffd3f12c87bd647fed (patch)
tree1a1e1f116c156285d079fe916d6fed6fbc830fad
parentdbd36d90a25ac075b98d95804306f57a4e43d063 (diff)
upgrade: test cases now have #name
-rw-r--r--test/support/browser_integration_test.rb2
-rw-r--r--test/test_helper.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 8201854..84440a1 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -102,7 +102,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
File.open(logfile_path, 'w') do |test_log|
test_log.puts self.class.name
test_log.puts "========================="
- test_log.puts __name__
+ test_log.puts name
test_log.puts Time.now
test_log.puts current_path
test_log.puts page.status_code
diff --git a/test/test_helper.rb b/test/test_helper.rb
index dfc6627..a06f710 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,5 @@
ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
+require_relative '../config/environment'
require 'rails/test_help'
require 'mocha/setup'
@@ -16,11 +16,11 @@ class ActiveSupport::TestCase
protected
def logfile_path
- Rails.root + 'tmp' + "#{self.class.name.underscore}.#{__name__}.log"
+ Rails.root + 'tmp' + "#{self.class.name.underscore}.#{name}.log"
end
def screenshot_path
- Rails.root + 'tmp' + "#{self.class.name.underscore}.#{__name__}.png"
+ Rails.root + 'tmp' + "#{self.class.name.underscore}.#{name}.png"
end
def file_path(name)