api tokens - clarify terms: "monitors" are admins that authenticated via api token, "tmp" users are users that exist only in tmp db, "test" users are either tmp users or users named "test_user_x"

4 files changed, 11 insertions, 7 deletions

diff --git a/test/factories.rb b/test/factories.rb
index b6e1475..5d49729 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -26,6 +26,10 @@ FactoryGirl.define do
       end
     end
 
+    factory :test_user do
+      login {"test_user_" + Faker::Internet.user_name + '_' + SecureRandom.hex(4)}
+    end
+
     factory :premium_user do
       effective_service_level_code 2
     end
diff --git a/test/integration/api/tmp_user_test.rb b/test/integration/api/tmp_user_test.rb
index 4c1e659..bf5f99d 100644
--- a/test/integration/api/tmp_user_test.rb
+++ b/test/integration/api/tmp_user_test.rb
@@ -4,7 +4,7 @@ require_relative 'srp_test'
 class TmpUserTest < SrpTest
 
   setup do
-    register_user('test_user_'+SecureRandom.hex(5))
+    register_user('tmp_user_'+SecureRandom.hex(5))
   end
 
   test "login with srp" do
diff --git a/test/unit/api_token_test.rb b/test/unit/api_token_test.rb
index 55d7507..266a370 100644
--- a/test/unit/api_token_test.rb
+++ b/test/unit/api_token_test.rb
@@ -6,15 +6,15 @@ class ApiTokenTest < ActiveSupport::TestCase
   end
 
   test "api token only authenticates ApiUser" do
-    token_string = APP_CONFIG['api_tokens']['test']
-    assert !token_string.nil?
+    token_string = APP_CONFIG['api_tokens']['monitor']
+    assert !token_string.nil?, 'monitor token should be configured'
     assert !token_string.empty?
     token = ApiToken.find_by_token(token_string)
     user = token.authenticate
     assert user, 'api token should authenticate'
     assert user.is_a?(ApiUser), 'api token should return api user'
-    assert user.is_test?, 'api test token should return test user'
-    assert !user.is_admin?, 'api test token should not return admin user'
+    assert user.is_monitor?, 'api monitor token should return monitor user'
+    assert !user.is_admin?, 'api monitor token should not return admin user'
   end
 
   test "invalid api tokens can't authenticate" do
diff --git a/test/unit/tmp_user_test.rb b/test/unit/tmp_user_test.rb
index 9494377..1dea5f9 100644
--- a/test/unit/tmp_user_test.rb
+++ b/test/unit/tmp_user_test.rb
@@ -6,7 +6,7 @@ class TmpUserTest < ActiveSupport::TestCase
     InviteCodeValidator.any_instance.stubs(:validate)
   end
 
-  test "test_user saved to tmp_users" do
+  test "tmp_user saved to tmp_users" do
     begin
       assert User.ancestors.include?(TemporaryUser)
 
@@ -17,7 +17,7 @@ class TmpUserTest < ActiveSupport::TestCase
       end
 
       assert_difference('User.tmp_database.info["doc_count"]') do
-        tmp_user = User.create!(:login => 'test_user_'+SecureRandom.hex(5).downcase,
+        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