From 72ae20ea3cd2c4534de5a99cc5e963ae9484bc62 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 26 Oct 2016 10:07:49 +0100 Subject: [PATCH] Replace user_preferences fixture with a factory. --- test/controllers/trace_controller_test.rb | 6 +++++- .../user_preference_controller_test.rb | 15 ++++++++++--- test/factories/user_preferences.rb | 9 ++++++++ test/fixtures/user_preferences.yml | 21 ------------------- test/models/user_preference_test.rb | 11 +--------- 5 files changed, 27 insertions(+), 35 deletions(-) create mode 100644 test/factories/user_preferences.rb delete mode 100644 test/fixtures/user_preferences.yml diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb index 2fec258af..5a5234cb5 100644 --- a/test/controllers/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" class TraceControllerTest < ActionController::TestCase - fixtures :users, :user_preferences, :gpx_files + fixtures :users, :gpx_files set_fixture_class :gpx_files => Trace def setup @@ -455,12 +455,14 @@ class TraceControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => :login, :referer => trace_create_path # Now authenticated as a user with gps.trace.visibility set + create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") get :create, {}, { :user => users(:public_user).id } assert_response :success assert_template :create assert_select "select#trace_visibility option[value=identifiable][selected]", 1 # Now authenticated as a user with gps.trace.public set + create(:user_preference, :user => users(:second_public_user), :k => "gps.trace.public", :v => "default") get :create, {}, { :user => users(:second_public_user).id } assert_response :success assert_template :create @@ -483,6 +485,7 @@ class TraceControllerTest < ActionController::TestCase assert_response :forbidden # Now authenticated + create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => users(:public_user).id } assert_response :redirect @@ -710,6 +713,7 @@ class TraceControllerTest < ActionController::TestCase assert_response :unauthorized # Now authenticated + create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v basic_authorization(users(:public_user).display_name, "test") post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" diff --git a/test/controllers/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb index c8f52b279..96ba4375c 100644 --- a/test/controllers/user_preference_controller_test.rb +++ b/test/controllers/user_preference_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" class UserPreferenceControllerTest < ActionController::TestCase - fixtures :users, :user_preferences + fixtures :users ## # test all routes which lead to this controller @@ -47,6 +47,8 @@ class UserPreferenceControllerTest < ActionController::TestCase end # authenticate as a user with preferences + user_preference = create(:user_preference, :user => users(:normal_user)) + user_preference2 = create(:user_preference, :user => users(:normal_user)) basic_authorization("test@openstreetmap.org", "test") # try the read again @@ -56,8 +58,8 @@ class UserPreferenceControllerTest < ActionController::TestCase assert_select "osm" do assert_select "preferences", :count => 1 do assert_select "preference", :count => 2 - assert_select "preference[k=\"#{user_preferences(:a).k}\"][v=\"#{user_preferences(:a).v}\"]", :count => 1 - assert_select "preference[k=\"#{user_preferences(:two).k}\"][v=\"#{user_preferences(:two).v}\"]", :count => 1 + assert_select "preference[k=\"#{user_preference.k}\"][v=\"#{user_preference.v}\"]", :count => 1 + assert_select "preference[k=\"#{user_preference2.k}\"][v=\"#{user_preference2.v}\"]", :count => 1 end end end @@ -65,6 +67,8 @@ class UserPreferenceControllerTest < ActionController::TestCase ## # test read_one action def test_read_one + create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value") + # try a read without auth get :read_one, :preference_key => "key" assert_response :unauthorized, "should be authenticated" @@ -86,6 +90,9 @@ class UserPreferenceControllerTest < ActionController::TestCase ## # test update action def test_update + create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value") + create(:user_preference, :user => users(:normal_user), :k => "some_key", :v => "some_value") + # try a put without auth assert_no_difference "UserPreference.count" do content "" @@ -173,6 +180,8 @@ class UserPreferenceControllerTest < ActionController::TestCase ## # test delete_one action def test_delete_one + create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value") + # try a delete without auth assert_no_difference "UserPreference.count" do delete :delete_one, :preference_key => "key" diff --git a/test/factories/user_preferences.rb b/test/factories/user_preferences.rb new file mode 100644 index 000000000..552cfcd75 --- /dev/null +++ b/test/factories/user_preferences.rb @@ -0,0 +1,9 @@ +FactoryGirl.define do + factory :user_preference do + sequence(:k) { |n| "Key #{n}" } + sequence(:v) { |n| "Value #{n}" } + + # FIXME: needs user factory + user_id 1 + end +end diff --git a/test/fixtures/user_preferences.yml b/test/fixtures/user_preferences.yml deleted file mode 100644 index 03065a9eb..000000000 --- a/test/fixtures/user_preferences.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html - -a: - user_id: 1 - k: "key" - v: "value" - -two: - user_id: 1 - k: "some_key" - v: "some_value" - -u2_trace: - user_id: 2 - k: "gps.trace.visibility" - v: "identifiable" - -u3_trace: - user_id: 4 - k: "gps.trace.public" - v: "default" diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb index d3400bc9d..c61bd607d 100644 --- a/test/models/user_preference_test.rb +++ b/test/models/user_preference_test.rb @@ -2,19 +2,10 @@ require "test_helper" class UserPreferenceTest < ActiveSupport::TestCase api_fixtures - fixtures :user_preferences - - # This checks to make sure that there are two user preferences - # stored in the test database. - # This test needs to be updated for every addition/deletion from - # the fixture file - def test_check_count - assert_equal 4, UserPreference.count - end # Checks that you cannot add a new preference, that is a duplicate def test_add_duplicate_preference - up = user_preferences(:a) + up = create(:user_preference) new_up = UserPreference.new new_up.user = users(:normal_user) new_up.k = up.k -- 2.39.5