diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index e553961..250a3fc 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -100,8 +100,6 @@ roles: [grant_permissions, modify_templates, modify_guidance, change_org_details, use_api] api_token: "ABCD1234ZYX987admincomplete" language: en-UK - user_type: org_admin - user_status: active confirmed_at: '2016-09-09 10:10:10' complete_user: @@ -114,6 +112,4 @@ organisation: complete api_token: "ABCD1234ZYX987usercomplete" language: en-UK - user_type: org_user - user_status: active confirmed_at: '2016-09-09 10:10:10' \ No newline at end of file diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 2d9c577..eff2c03 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -9,8 +9,6 @@ @organisation = organisations(:curation_center) @language = languages(I18n.default_locale) - @user_status = user_statuses(:active) - @user_type = user_types(:admin) @dmptemplate = dmptemplates(:cc_template) @@ -23,9 +21,7 @@ accept_terms: 'true', organisation: @organisation, api_token: 'ABC123', - language: @language, - user_type: @user_type, - user_status: @user_status) + language: @language) end # --------------------------------------------------- @@ -191,16 +187,6 @@ end # --------------------------------------------------- - test "can manage belongs_to relationship with UserType" do - verify_belongs_to_relationship(@super, @user_type) - end - - # --------------------------------------------------- - test "can manage belongs_to relationship with UserStatus" do - verify_belongs_to_relationship(@super, @user_status) - end - - # --------------------------------------------------- test "can manage belongs_to relationship with Organisation" do verify_belongs_to_relationship(@super, @organisation) end