X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8fc5d7b3a697e08391296ac4d434f4f4a23a695a..a013ad4808a9888e5632b1965fc13c8b1dcc045d:/apps/workbench/test/functional/projects_controller_test.rb diff --git a/apps/workbench/test/functional/projects_controller_test.rb b/apps/workbench/test/functional/projects_controller_test.rb index e8a696bb12..d76430cfdf 100644 --- a/apps/workbench/test/functional/projects_controller_test.rb +++ b/apps/workbench/test/functional/projects_controller_test.rb @@ -1,13 +1,20 @@ require 'test_helper' class ProjectsControllerTest < ActionController::TestCase - test "inactive user is asked to sign user agreements on front page" do + test "invited user is asked to sign user agreements on front page" do get :index, {}, session_for(:inactive) - assert_response :success - assert_not_empty assigns(:required_user_agreements), - "Inactive user did not have required_user_agreements" - assert_template 'user_agreements/index', - "Inactive user was not presented with a user agreement at the front page" + assert_response :redirect + assert_match(/^#{Regexp.escape(user_agreements_url)}\b/, + @response.redirect_url, + "Inactive user was not redirected to user_agreements page") + end + + test "uninvited user is asked to wait for activation" do + get :index, {}, session_for(:inactive_uninvited) + assert_response :redirect + assert_match(/^#{Regexp.escape(inactive_users_url)}\b/, + @response.redirect_url, + "Uninvited user was not redirected to inactive user page") end [[:active, true], @@ -93,8 +100,15 @@ class ProjectsControllerTest < ActionController::TestCase "Did not get exactly one row") end - test 'projects#show tab infinite scroll partial does not group object types' do + ['', ' asc', ' desc'].each do |direction| + test "projects#show tab partial orders correctly by #{direction}" do + _test_tab_content_order direction + end + end + + def _test_tab_content_order direction get_contents_rows(limit: 100, + order: "created_at#{direction}", filters: [['uuid','is_a',['arvados#job', 'arvados#pipelineInstance']]]) assert_response :success @@ -103,16 +117,24 @@ class ProjectsControllerTest < ActionController::TestCase last_kind = nil found_kind = {} json_response['content'].scan /