From 6335891a4c53c6db535dd059d7c76557abebef42 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 23 Feb 2017 14:13:09 +0000 Subject: [PATCH] User factories for browse, oauth_clients and site controller tests. --- test/controllers/browse_controller_test.rb | 6 ++-- .../oauth_clients_controller_test.rb | 16 +++++----- test/controllers/site_controller_test.rb | 30 +++++++++---------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index c5f1eef5c..19f60035b 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -81,7 +81,7 @@ class BrowseControllerTest < ActionController::TestCase browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 3 - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 4 @@ -106,7 +106,7 @@ class BrowseControllerTest < ActionController::TestCase assert_template "browse/not_found" assert_template :layout => "xhr" - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id browse_check "note", hidden_note_with_comment.id, "browse/note" end @@ -119,7 +119,7 @@ class BrowseControllerTest < ActionController::TestCase browse_check "note", note_with_hidden_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 1 - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id browse_check "note", note_with_hidden_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 2 diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb index 020521bac..76f366e3d 100644 --- a/test/controllers/oauth_clients_controller_test.rb +++ b/test/controllers/oauth_clients_controller_test.rb @@ -1,8 +1,6 @@ require "test_helper" class OauthClientsControllerTest < ActionController::TestCase - fixtures :users - ## # test all routes which lead to this controller def test_routes @@ -37,7 +35,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_index - user = users(:public_user) + user = create(:user) create_list(:client_application, 2, :user => user) get :index, :display_name => user.display_name @@ -51,7 +49,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_new - user = users(:public_user) + user = create(:user) get :new, :display_name => user.display_name assert_response :redirect @@ -72,7 +70,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_create - user = users(:public_user) + user = create(:user) assert_difference "ClientApplication.count", 0 do post :create, :display_name => user.display_name @@ -104,7 +102,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_show - user = users(:public_user) + user = create(:user) client = create(:client_application, :user => user) other_client = create(:client_application) @@ -122,7 +120,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_edit - user = users(:public_user) + user = create(:user) client = create(:client_application, :user => user) other_client = create(:client_application) @@ -149,7 +147,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_update - user = users(:public_user) + user = create(:user) client = create(:client_application, :user => user) other_client = create(:client_application) @@ -184,7 +182,7 @@ class OauthClientsControllerTest < ActionController::TestCase end def test_destroy - user = users(:public_user) + user = create(:user) client = create(:client_application, :user => user) other_client = create(:client_application) diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index 37f457523..608263643 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -172,7 +172,7 @@ class SiteControllerTest < ActionController::TestCase # Test the right editor gets used when the user hasn't set a preference def test_edit_without_preference - get :edit, nil, :user => users(:public_user) + get :edit, nil, :user => create(:user) assert_response :success assert_template "edit" assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1 @@ -180,7 +180,7 @@ class SiteControllerTest < ActionController::TestCase # Test the right editor gets used when the user has set a preference def test_edit_with_preference - user = users(:public_user) + user = create(:user) user.preferred_editor = "id" user.save! @@ -189,7 +189,7 @@ class SiteControllerTest < ActionController::TestCase assert_template "edit" assert_template :partial => "_id", :count => 1 - user = users(:public_user) + user = create(:user) user.preferred_editor = "potlatch2" user.save! @@ -198,7 +198,7 @@ class SiteControllerTest < ActionController::TestCase assert_template "edit" assert_template :partial => "_potlatch2", :count => 1 - user = users(:public_user) + user = create(:user) user.preferred_editor = "potlatch" user.save! @@ -207,7 +207,7 @@ class SiteControllerTest < ActionController::TestCase assert_template "edit" assert_template :partial => "_potlatch", :count => 1 - user = users(:public_user) + user = create(:user) user.preferred_editor = "remote" user.save! @@ -218,29 +218,29 @@ class SiteControllerTest < ActionController::TestCase # Test the right editor gets used when the URL has an override def test_edit_with_override - get :edit, { :editor => "id" }, { :user => users(:public_user) } + get :edit, { :editor => "id" }, { :user => create(:user) } assert_response :success assert_template "edit" assert_template :partial => "_id", :count => 1 - get :edit, { :editor => "potlatch2" }, { :user => users(:public_user) } + get :edit, { :editor => "potlatch2" }, { :user => create(:user) } assert_response :success assert_template "edit" assert_template :partial => "_potlatch2", :count => 1 - get :edit, { :editor => "potlatch" }, { :user => users(:public_user) } + get :edit, { :editor => "potlatch" }, { :user => create(:user) } assert_response :success assert_template "edit" assert_template :partial => "_potlatch", :count => 1 - get :edit, { :editor => "remote" }, { :user => users(:public_user) } + get :edit, { :editor => "remote" }, { :user => create(:user) } assert_response :success assert_template "index" end # Test editing a specific node def test_edit_with_node - user = users(:public_user) + user = create(:user) node = current_nodes(:visible_node) get :edit, { :node => node.id }, { :user => user } @@ -253,7 +253,7 @@ class SiteControllerTest < ActionController::TestCase # Test editing a specific way def test_edit_with_way - user = users(:public_user) + user = create(:user) way = current_ways(:visible_way) get :edit, { :way => way.id }, { :user => user } @@ -266,7 +266,7 @@ class SiteControllerTest < ActionController::TestCase # Test editing a specific note def test_edit_with_note - user = users(:public_user) + user = create(:user) note = create(:note) do |n| n.comments.create(:author_id => user.id) end @@ -281,7 +281,7 @@ class SiteControllerTest < ActionController::TestCase # Test editing a specific GPX trace def test_edit_with_gpx - user = users(:public_user) + user = create(:user) gpx = create(:trace, :latitude => 1, :longitude => 1) get :edit, { :gpx => gpx.id }, { :user => user } @@ -317,7 +317,7 @@ class SiteControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome" - get :welcome, nil, :user => users(:public_user) + get :welcome, nil, :user => create(:user) assert_response :success assert_template "welcome" end @@ -377,7 +377,7 @@ class SiteControllerTest < ActionController::TestCase # Test the id frame def test_id - get :id, nil, :user => users(:public_user) + get :id, nil, :user => create(:user) assert_response :success assert_template "id" assert_template :layout => false -- 2.43.2