Skip to content

Commit

Permalink
Added missing regression tests for uploading file routing fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
akrassikov committed Nov 28, 2011
1 parent 330a9cd commit ed9d515
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 4 deletions.
7 changes: 6 additions & 1 deletion test/functional/annotation_categories_controller_test.rb
Expand Up @@ -395,7 +395,8 @@ class AnnotationCategoriesControllerTest < AuthenticatedControllerTest
should set_the_flash.to((I18n.t('annotations.upload.success', :annotation_category_number => 1)))
should assign_to :assignment
should "route properly" do
assert_recognizes({:controller => "annotation_categories", :assignment_id => "1", :action => "csv_upload" }, {:path => "assignments/1/annotation_categories/csv_upload", :method => :post})
assert_recognizes({:controller => "annotation_categories", :assignment_id => "1", :action => "csv_upload" },
{:path => "assignments/1/annotation_categories/csv_upload", :method => :post})
end
end

Expand All @@ -421,6 +422,10 @@ class AnnotationCategoriesControllerTest < AuthenticatedControllerTest
new_categories_list = @assignment.annotation_categories
assert_equal(@old_annotation_categories.length + 1, (new_categories_list.length))
end
should "route properly" do
assert_recognizes({:controller => "annotation_categories", :assignment_id => "1", :action => "yml_upload" },
{:path => "assignments/1/annotation_categories/yml_upload", :method => :post})
end
end

context "on :yml_upload with an error" do
Expand Down
4 changes: 4 additions & 0 deletions test/functional/graders_controller_test.rb
Expand Up @@ -197,6 +197,8 @@ def setup
assert @grouping2.tas.include? @ta1
assert @grouping3.tas.count == 1
assert @grouping3.tas.include? @ta3
assert_recognizes({:controller => "graders", :assignment_id => "1", :action => "csv_upload_grader_groups_mapping" },
{:path => "assignments/1/graders/csv_upload_grader_groups_mapping", :method => :post})
end

should "and some graders are invalid" do
Expand Down Expand Up @@ -275,6 +277,8 @@ def setup
assert @criterion2.tas.include? @ta1
assert @criterion3.tas.count == 1
assert @criterion3.tas.include? @ta3
assert_recognizes({:controller => "graders", :assignment_id => "1", :action => "csv_upload_grader_criteria_mapping" },
{:path => "assignments/1/graders/csv_upload_grader_criteria_mapping", :method => :post})
end

should "and some graders are invalid" do
Expand Down
5 changes: 4 additions & 1 deletion test/functional/groups_controller_csv_upload_test.rb
Expand Up @@ -95,7 +95,10 @@ class GroupsControllerCsvUploadTest < AuthenticatedControllerTest
assert_equal(expected_list.sort, Dir.glob("c*").sort, "Expected repositories to be named after usernames")
assert_equal([], Dir.glob("group_*"), "Did not expect autogenerated repository names")
end

should "route properly" do
assert_recognizes({:controller => "groups", :assignment_id => "1", :action => "csv_upload" },
{:path => "assignments/1/groups/csv_upload", :method => :post})
end
end

context "should be able to upload groups using CSV file upload, and repos" do
Expand Down
6 changes: 6 additions & 0 deletions test/functional/rubrics_controller_test.rb
Expand Up @@ -478,6 +478,9 @@ class RubricsControllerTest < AuthenticatedControllerTest
:invalid_lines => ["criterion 5: " + I18n.t('criteria.error.incomplete_row'),
"criterion 6: " + I18n.t('criteria.error.incomplete_row')])
should respond_with :redirect
should "route properly" do
assert_recognizes({:controller => "rubrics", :assignment_id => "1", :action => "csv_upload" }, {:path => "assignments/1/rubrics/csv_upload", :method => :post})
end
end

context "with file containing full records" do
Expand Down Expand Up @@ -567,6 +570,9 @@ class RubricsControllerTest < AuthenticatedControllerTest
assert_equal(@assignment.rubric_criteria[0].level_4_name, "poor")
assert_equal(@assignment.rubric_criteria[0].level_4_description, "I expected more")
end
should "route properly" do
assert_recognizes({:controller => "rubrics", :assignment_id => "1", :action => "yml_upload" }, {:path => "assignments/1/rubrics/yml_upload", :method => :post})
end
end

context "with preexisting criteria" do
Expand Down
1 change: 0 additions & 1 deletion test/functional/students_controller_test.rb
Expand Up @@ -149,7 +149,6 @@ def setup
assert_generates "/en/students/upload_student_list", :controller => "students", :action => "upload_student_list"
assert_recognizes({:controller => "students", :action => "upload_student_list" }, {:path => "students/upload_student_list", :method => :post})
end

end # -- with a student
end # -- An admin
end
Expand Down
3 changes: 2 additions & 1 deletion test/functional/tas_controller_test.rb
Expand Up @@ -80,7 +80,8 @@ def setup
c8mahler = Ta.find_by_user_name('c8mahlernew')
assert_not_nil c8mahler
assert_generates "/en/tas/upload_ta_list", :controller => "tas", :action => "upload_ta_list"
assert_recognizes({:controller => "tas", :action => "upload_ta_list" }, {:path => "tas/upload_ta_list", :method => :post})
assert_recognizes({:controller => "tas", :action => "upload_ta_list" },
{:path => "tas/upload_ta_list", :method => :post})
end
end # -- With a TA
end # -- An admin
Expand Down

0 comments on commit ed9d515

Please sign in to comment.