summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-24 09:08:46 +0100
committerAzul <azul@riseup.net>2016-05-02 08:24:41 -0300
commit6d9bd6b966ec2370b7f8659b0810b03c5d1568aa (patch)
tree22ae34aa0a2bc2c04f13ff626365a1f162d34585
parent0ac511a31a6652ab00bbc765079b1c56128b191f (diff)
upgrade: unique test names
Rails 4.2 runs all tests mixed together. So unit tests and integration tests may not have conflicting names.
-rw-r--r--test/integration/api/token_auth_test.rb (renamed from test/integration/api/token_test.rb)2
-rw-r--r--test/unit/temporary_user_test.rb (renamed from test/unit/tmp_user_test.rb)2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/api/token_test.rb b/test/integration/api/token_auth_test.rb
index dafbfb7..3b83f23 100644
--- a/test/integration/api/token_test.rb
+++ b/test/integration/api/token_auth_test.rb
@@ -1,7 +1,7 @@
require_relative '../../test_helper'
require_relative 'srp_test'
-class TokenTest < SrpTest
+class TokenAuthTest < SrpTest
setup do
register_user
diff --git a/test/unit/tmp_user_test.rb b/test/unit/temporary_user_test.rb
index 1dea5f9..38ccd67 100644
--- a/test/unit/tmp_user_test.rb
+++ b/test/unit/temporary_user_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class TmpUserTest < ActiveSupport::TestCase
+class TemporaryUserTest < ActiveSupport::TestCase
setup do
InviteCodeValidator.any_instance.stubs(:validate)