From 6d9bd6b966ec2370b7f8659b0810b03c5d1568aa Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:08:46 +0100
Subject: upgrade: unique test names

Rails 4.2 runs all tests mixed together. So unit tests and integration tests
may not have conflicting names.
---
 test/integration/api/token_auth_test.rb | 16 ++++++++++++++++
 test/integration/api/token_test.rb      | 16 ----------------
 test/unit/temporary_user_test.rb        | 33 +++++++++++++++++++++++++++++++++
 test/unit/tmp_user_test.rb              | 33 ---------------------------------
 4 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 test/integration/api/token_auth_test.rb
 delete mode 100644 test/integration/api/token_test.rb
 create mode 100644 test/unit/temporary_user_test.rb
 delete mode 100644 test/unit/tmp_user_test.rb

diff --git a/test/integration/api/token_auth_test.rb b/test/integration/api/token_auth_test.rb
new file mode 100644
index 0000000..3b83f23
--- /dev/null
+++ b/test/integration/api/token_auth_test.rb
@@ -0,0 +1,16 @@
+require_relative '../../test_helper'
+require_relative 'srp_test'
+
+class TokenAuthTest < SrpTest
+
+  setup do
+    register_user
+  end
+
+  test "stores token SHA512 encoded" do
+    authenticate
+    token = server_auth['token']
+    assert Token.find(Digest::SHA512.hexdigest(token))
+  end
+
+end
diff --git a/test/integration/api/token_test.rb b/test/integration/api/token_test.rb
deleted file mode 100644
index dafbfb7..0000000
--- a/test/integration/api/token_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require_relative '../../test_helper'
-require_relative 'srp_test'
-
-class TokenTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "stores token SHA512 encoded" do
-    authenticate
-    token = server_auth['token']
-    assert Token.find(Digest::SHA512.hexdigest(token))
-  end
-
-end
diff --git a/test/unit/temporary_user_test.rb b/test/unit/temporary_user_test.rb
new file mode 100644
index 0000000..38ccd67
--- /dev/null
+++ b/test/unit/temporary_user_test.rb
@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class TemporaryUserTest < ActiveSupport::TestCase
+
+  setup do
+    InviteCodeValidator.any_instance.stubs(:validate)
+  end
+
+  test "tmp_user saved to tmp_users" do
+    begin
+      assert User.ancestors.include?(TemporaryUser)
+
+      assert_difference('User.database.info["doc_count"]') do
+        normal_user = User.create!(:login => 'a'+SecureRandom.hex(5).downcase,
+          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
+        refute normal_user.database.to_s.include?('tmp')
+      end
+
+      assert_difference('User.tmp_database.info["doc_count"]') do
+        tmp_user = User.create!(:login => 'tmp_user_'+SecureRandom.hex(5).downcase,
+          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
+        assert tmp_user.database.to_s.include?('tmp')
+      end
+    ensure
+      begin
+        normal_user.destroy
+        tmp_user.destroy
+      rescue
+      end
+    end
+  end
+
+end
diff --git a/test/unit/tmp_user_test.rb b/test/unit/tmp_user_test.rb
deleted file mode 100644
index 1dea5f9..0000000
--- a/test/unit/tmp_user_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'test_helper'
-
-class TmpUserTest < ActiveSupport::TestCase
-
-  setup do
-    InviteCodeValidator.any_instance.stubs(:validate)
-  end
-
-  test "tmp_user saved to tmp_users" do
-    begin
-      assert User.ancestors.include?(TemporaryUser)
-
-      assert_difference('User.database.info["doc_count"]') do
-        normal_user = User.create!(:login => 'a'+SecureRandom.hex(5).downcase,
-          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
-        refute normal_user.database.to_s.include?('tmp')
-      end
-
-      assert_difference('User.tmp_database.info["doc_count"]') do
-        tmp_user = User.create!(:login => 'tmp_user_'+SecureRandom.hex(5).downcase,
-          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
-        assert tmp_user.database.to_s.include?('tmp')
-      end
-    ensure
-      begin
-        normal_user.destroy
-        tmp_user.destroy
-      rescue
-      end
-    end
-  end
-
-end
-- 
cgit v1.2.3