diff --git a/test/integration/dataset_deposit_test.rb b/test/integration/dataset_deposit_test.rb index efac39d..9701c75 100644 --- a/test/integration/dataset_deposit_test.rb +++ b/test/integration/dataset_deposit_test.rb @@ -8,7 +8,7 @@ class DatasetDepositTest < ActionDispatch::IntegrationTest setup do - @user = user_identities :researcher1 + @user = users :researcher1 log_in_as(@user) end diff --git a/test/integration/dataset_search_test.rb b/test/integration/dataset_search_test.rb index 1a574b4..9e93477 100644 --- a/test/integration/dataset_search_test.rb +++ b/test/integration/dataset_search_test.rb @@ -20,7 +20,7 @@ class DatasetSearchTest < ActionDispatch::IntegrationTest test "default listing for depositor" do Dataset.all.each(&:ensure_creator_editors) - @user = user :researcher1 + @user = users :researcher1 log_in_as(@user) get datasets_path assert_response :success @@ -34,7 +34,7 @@ class DatasetSearchTest < ActionDispatch::IntegrationTest test "default listing for curator" do Dataset.all.each(&:ensure_creator_editors) - @user = user :curator1 + @user = users :curator1 log_in_as(@user) get datasets_path assert_response :success diff --git a/test/integration/dataset_version_test.rb b/test/integration/dataset_version_test.rb index ffdd47c..df8ae28 100644 --- a/test/integration/dataset_version_test.rb +++ b/test/integration/dataset_version_test.rb @@ -8,7 +8,7 @@ class DatasetVersionTest < ActionDispatch::IntegrationTest setup do - @user = user_identities :researcher1 + @user = users :researcher1 log_in_as(@user) end diff --git a/test/integration/orcid_api_test.rb b/test/integration/orcid_api_test.rb index 97de036..f5953d1 100644 --- a/test/integration/orcid_api_test.rb +++ b/test/integration/orcid_api_test.rb @@ -8,7 +8,7 @@ class OrcidApiTest < ActionDispatch::IntegrationTest setup do - @user = user_identities :researcher1 + @user = users :researcher1 log_in_as(@user) end diff --git a/test/test_helper.rb b/test/test_helper.rb index ad4b5fb..04ca13e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -7,7 +7,7 @@ class ActiveSupport::TestCase # Setup fixtures in test/fixtures/*.yml - fixtures :invitees, :identities, "user/identities", :datasets, :datafiles, :creators, :related_materials + fixtures :users, :datasets, :datafiles, :creators, :related_materials def self.seeding? @@seeding @@ -18,9 +18,10 @@ def self.seeding? # (local, non-shibboleth) identity provider is assumed # def log_in_as(user) - post "/auth/identity/callback", params: { - auth_key: user.email, - password: "password" + post "/auth/developer/callback", params: { + email: user.email, + name: user.name, + role: user.role } end