diff options
Diffstat (limited to 'test/functional')
-rw-r--r-- | test/functional/api/identities_controller_test.rb | 7 | ||||
-rw-r--r-- | test/functional/api/messages_controller_test.rb | 13 | ||||
-rw-r--r-- | test/functional/api/users_controller_test.rb | 4 | ||||
-rw-r--r-- | test/functional/identities_controller_test.rb | 16 |
4 files changed, 22 insertions, 18 deletions
diff --git a/test/functional/api/identities_controller_test.rb b/test/functional/api/identities_controller_test.rb index 57345c8..bb5608e 100644 --- a/test/functional/api/identities_controller_test.rb +++ b/test/functional/api/identities_controller_test.rb @@ -4,7 +4,7 @@ class Api::IdentitiesControllerTest < ApiControllerTest test "api monitor can fetch identity" do monitor_auth do - identity = FactoryGirl.create :identity + identity = create_identity api_get :show, :id => identity.address, :format => 'json' assert_response :success assert_equal identity, assigns(:identity) @@ -16,9 +16,12 @@ class Api::IdentitiesControllerTest < ApiControllerTest test "anonymous cannot fetch identity" do - identity = FactoryGirl.create :identity + identity = create_identity api_get :show, :id => identity.address, :format => 'json' assert_response :forbidden end + def create_identity + FactoryBot.create :identity + end end diff --git a/test/functional/api/messages_controller_test.rb b/test/functional/api/messages_controller_test.rb index e586980..31ba2b0 100644 --- a/test/functional/api/messages_controller_test.rb +++ b/test/functional/api/messages_controller_test.rb @@ -2,17 +2,12 @@ require 'test_helper' class Api::MessagesControllerTest < ApiControllerTest - setup do - @user = FactoryGirl.build(:user) - @user.save - end - # NOTE: the available languages for test are :en and :de # so :es will result in english response. test "get the motd" do with_config("customization_directory" => Rails.root+'test/files') do - login @user + login api_get :index, :locale => 'es' body = JSON.parse(response.body) message1 = "<p>\"This\" is a <strong>very</strong> fine message. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n" @@ -23,7 +18,7 @@ class Api::MessagesControllerTest < ApiControllerTest test "get localized motd" do with_config("customization_directory" => Rails.root+'test/files') do - login @user + login api_get :index, :locale => 'de' body = JSON.parse(response.body) message1 = "<p>Dies ist eine sehr feine Nachricht. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n" @@ -32,7 +27,7 @@ class Api::MessagesControllerTest < ApiControllerTest end test "get empty motd" do - login @user + login api_get :index assert_equal "[]", response.body, "motd response should be empty if no motd directory exists" end @@ -44,7 +39,7 @@ class Api::MessagesControllerTest < ApiControllerTest =begin setup do InviteCodeValidator.any_instance.stubs(:validate) - @user = FactoryGirl.build(:user) + @user = FactoryBot.build(:user) @user.save @message = Message.new(:text => 'a test message') @message.user_ids_to_show << @user.id diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb index ee183f9..dfaf959 100644 --- a/test/functional/api/users_controller_test.rb +++ b/test/functional/api/users_controller_test.rb @@ -96,7 +96,7 @@ class Api::UsersControllerTest < ApiControllerTest end test "admin can show user" do - user = FactoryGirl.create :user + user = FactoryBot.create :user login :is_admin? => true api_get :show, :id => 0, :login => user.login, :format => :json assert_response :success @@ -109,7 +109,7 @@ class Api::UsersControllerTest < ApiControllerTest end test "admin can show is_admin property" do - admin = FactoryGirl.create :user + admin = FactoryBot.create :user with_config(admins: [admin.login]) do login admin api_get :show, :id => admin.id, :format => :json diff --git a/test/functional/identities_controller_test.rb b/test/functional/identities_controller_test.rb index 5af2e88..5e46f9c 100644 --- a/test/functional/identities_controller_test.rb +++ b/test/functional/identities_controller_test.rb @@ -1,4 +1,4 @@ -require_relative '../test_helper' +require 'test_helper' class IdentitiesControllerTest < ActionController::TestCase @@ -26,7 +26,7 @@ class IdentitiesControllerTest < ActionController::TestCase test "admin can unblock username" do # an identity without user_id and destination is a blocked handle - identity = FactoryGirl.create :identity + identity = create_identity login :is_admin? => true delete :destroy, id: identity.id assert_response :redirect @@ -34,13 +34,19 @@ class IdentitiesControllerTest < ActionController::TestCase end test "admin cannot remove main identity" do - user = FactoryGirl.create :user - identity = FactoryGirl.create :identity, - Identity.attributes_from_user(user) + user = create_user + identity = create_identity Identity.attributes_from_user(user) login :is_admin? => true delete :destroy, id: identity.id assert_response :redirect assert_equal identity, Identity.find(identity.id) end + def create_identity(attrs={}) + FactoryBot.create :identity, attrs + end + + def create_user + FactoryBot.create :user + end end |