diff --git a/app/views/tags/_upload_modal.html.erb b/app/views/tags/_upload_modal.html.erb
index 72b59a2925..b87cea2250 100644
--- a/app/views/tags/_upload_modal.html.erb
+++ b/app/views/tags/_upload_modal.html.erb
@@ -11,7 +11,7 @@
button_id: 'submit_upload',
nonce: true %>
- <%= t('upload_help_html', section_id: 'tags') %>
+ <%= t('upload_help_html', markus_version: @markus_version, section_id: 'tags') %>
<%= form_tag upload_course_tags_path(@current_course, assignment_id: @assignment.id),
{ multipart: true, size: 1 } do %>
diff --git a/app/views/tas/_upload_modal.html.erb b/app/views/tas/_upload_modal.html.erb
index 03957080dd..5b7507b033 100644
--- a/app/views/tas/_upload_modal.html.erb
+++ b/app/views/tas/_upload_modal.html.erb
@@ -11,7 +11,7 @@
nonce: true %>
- <%= t('upload_help_html', section_id: 'students') %>
+ <%= t('upload_help_html', markus_version: @markus_version, section_id: 'students') %>
<%= form_tag upload_course_tas_path(@current_course), { multipart: true } do %>
diff --git a/app/views/users/_key_display.html.erb b/app/views/users/_key_display.html.erb
index 4983cc0094..966f9e9d29 100644
--- a/app/views/users/_key_display.html.erb
+++ b/app/views/users/_key_display.html.erb
@@ -3,7 +3,7 @@
<%= User.human_attribute_name(:api_key) %>
- <%= t('users.api_key.help_html') %>
+ <%= t('users.api_key.help_html', markus_version: @markus_version,) %>
diff --git a/app/views/users/settings.html.erb b/app/views/users/settings.html.erb
index 090ee68bcf..78ff0a3559 100644
--- a/app/views/users/settings.html.erb
+++ b/app/views/users/settings.html.erb
@@ -57,12 +57,12 @@
<%= t('help') %>
-
+
<%= t('key_pairs.help.windows') %>
-
+
<%= t('key_pairs.help.macOS_linux') %>
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 4d9b0319b4..9cf0d689fa 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -3,7 +3,7 @@
# The "main" locale.
base_locale: en
## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-# locales: [en]
+locales: [en]
## Reporting locale, default: en. Available: en, ru.
# internal_locale: en
diff --git a/config/locales/defaults/download_upload/en.yml b/config/locales/defaults/download_upload/en.yml
index a9d682049e..07ab3e8eb6 100644
--- a/config/locales/defaults/download_upload/en.yml
+++ b/config/locales/defaults/download_upload/en.yml
@@ -18,7 +18,7 @@ en:
malformed_csv: The selected file was improperly formed. Please ensure the file meets MarkUs specifications.
syntax_error: 'There is an error in the file you uploaded: %{error}'
unparseable_csv: The selected file is not a CSV file (even though it may have a .csv extension).
- upload_help_html: ' For information about the file format(s) supported, please visit
this page.'
+ upload_help_html: ' For information about the file format(s) supported, please visit
this page.'
upload_success:
one: "%{count} object successfully uploaded."
other: "%{count} objects successfully uploaded."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 73fbd734b7..a1f4e08b7f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,6 +38,7 @@ en:
file_conflicts: 'Your changes have not been made. The following file conflicts were detected:'
file_too_large: The size of the uploaded file %{file_name} exceeds the maximum of %{max_size} MB.
invalid_file_name: Invalid file name on submitted file
+ invalid_folder_name: Invalid folder name on submitted folder
missing_file: Could not download %{file_name}. File may be missing.
missing_files: 'You still need to submit %{file} required file(s) for this assignment:'
no_action_detected: No actions were detected in the last submit. Nothing was changed.
diff --git a/config/locales/views/assignments/en.yml b/config/locales/views/assignments/en.yml
index 7a688322af..c2aee46498 100644
--- a/config/locales/views/assignments/en.yml
+++ b/config/locales/views/assignments/en.yml
@@ -82,5 +82,5 @@ en:
started_on: 'You started on:'
starter_file_prompt: Click below to download the starter files for this assessment.
time_until_due_warning: This assessment is due before %{due_date} without penalty.
- upload_config_help_html: "
This zip file will configure and create this assignment.
This does not configure student or grader settings.
For more information please visit this page.
"
+ upload_config_help_html: "
This zip file will configure and create this assignment.
This does not configure student or grader settings.
For more information please visit this page.
"
upload_file_requirement: The list of uploaded files does not match the required files for this assignment.
diff --git a/config/locales/views/main/en.yml b/config/locales/views/main/en.yml
index 84999af44b..0335ecf608 100644
--- a/config/locales/views/main/en.yml
+++ b/config/locales/views/main/en.yml
@@ -17,6 +17,7 @@ en:
password_not_blank: Your password must not be blank.
role_switch:
clear_role_switch_session: Cancel role switch
+ forbidden_warning: You do not have permission to view that page while switching roles.
log_in_as: Log in as
switch_role: Switch Role
session_expired: Your session has expired. Please log in.
diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml
index 984a411bfa..42363bb6f1 100644
--- a/config/locales/views/users/en.yml
+++ b/config/locales/views/users/en.yml
@@ -32,7 +32,7 @@ en:
users:
account_settings: Account Settings
api_key:
- help_html: The API key is used for authentication for the MarkUs API. See
MarkUs Wiki for information on using the API.
+ help_html: The API key is used for authentication for the MarkUs API. See
MarkUs Wiki for information on using the API.
reset: Reset API key
unavailable: Unavailable
not_found: 'No user can be found with the user name: %{user_names}'
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index 4a1d1e5ea9..b4109487e8 100644
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -7,7 +7,7 @@ Tickets and/or bug reports:
https://github.com/MarkUsProject/Markus/issues
Wiki:
- https://github.com/MarkUsProject/Markus/wiki
+ https://github.com/MarkUsProject/Wiki
Contact us:
markus-users@cs.toronto.edu
diff --git a/spec/controllers/assignments_controller_spec.rb b/spec/controllers/assignments_controller_spec.rb
index 6f1eb06215..5213db1344 100644
--- a/spec/controllers/assignments_controller_spec.rb
+++ b/spec/controllers/assignments_controller_spec.rb
@@ -898,7 +898,8 @@
end
describe '#update_starter_file' do
subject { post_as role, :update_starter_file, params: params }
- let(:assignment) { create :assignment }
+ let!(:assignment) { create :assignment }
+ let!(:grouping) { create :grouping, assignment: assignment }
let(:starter_file_group1) do
create :starter_file_group, assignment: assignment, name: 'name', entry_rename: 'name', use_rename: false
end
@@ -926,6 +927,19 @@
change { assignment.reload.default_starter_file_group_id }.from(nil).to(starter_file_group2.id)
)
end
+ it 'should update starter_file_updated_at' do
+ expect { subject }.to(
+ change { assignment.assignment_properties.reload.starter_file_updated_at }
+ )
+ end
+ context 'when a grouping for the assignment exists' do
+ it 'should update the grouping starter_file_changed attribute' do
+ grouping
+ expect { subject }.to(
+ change { grouping.reload.starter_file_changed }.from(false).to(true)
+ )
+ end
+ end
context 'when a section exists' do
it 'should update section starter file mappings' do
expect { subject }.to(
@@ -964,17 +978,47 @@
end
end
end
+ context 'when only updating assignment starter_files_after_due attribute' do
+ let!(:params) do
+ { id: assignment.id,
+ course_id: role.course.id,
+ assignment: { starter_files_after_due: false },
+ sections: [],
+ starter_file_groups: [{ id: starter_file_group1.id,
+ name: starter_file_group1.name,
+ entry_rename: starter_file_group1.entry_rename,
+ use_rename: starter_file_group1.use_rename }] }
+ end
+ it 'should update starter_files_after_due' do
+ expect { subject }.to(
+ change { assignment.assignment_properties.reload.starter_files_after_due }.from(true).to(false)
+ )
+ end
+ it 'should not update starter_file_updated_at' do
+ expect { subject }.to_not(
+ change { assignment.assignment_properties.reload.starter_file_updated_at }
+ )
+ end
+ context 'when a grouping for the assignment exists' do
+ it 'should not update the grouping starter_file_changed attribute' do
+ grouping
+ expect { subject }.to_not(
+ change { grouping.reload.starter_file_changed }
+ )
+ end
+ end
+ end
end
context 'a grader' do
let(:role) { create :ta }
- it 'should return a 404 error' do
+ it 'should return a 403 error' do
subject
expect(response).to have_http_status(403)
end
end
context 'a student' do
let(:role) { create :student }
- it 'should return a 404 error' do
+ it 'should return a 403 error' do
subject
expect(response).to have_http_status(403)
end
diff --git a/spec/controllers/grade_entry_forms_controller_spec.rb b/spec/controllers/grade_entry_forms_controller_spec.rb
index b3d835f463..9b35993753 100644
--- a/spec/controllers/grade_entry_forms_controller_spec.rb
+++ b/spec/controllers/grade_entry_forms_controller_spec.rb
@@ -567,4 +567,58 @@
include_examples 'switch assignment tests'
end
end
+
+ describe '#populate_grades_table' do
+ before(:each) do
+ get_as role, :populate_grades_table, params: { course_id: course.id, id: grade_entry_form_with_data.id }
+ end
+ context 'an instructor' do
+ let(:data_fields) { %w[_id released_to_student user_name first_name last_name hidden section_id] }
+ it 'returns a 200 response' do
+ expect(response.status).to eq 200
+ end
+ it 'returns data' do
+ expect(response.parsed_body['data'].length).to be > 0
+ end
+ it 'returns all student data' do
+ expect(response.parsed_body['data'].length).to eq course.students.count
+ end
+ it 'returns correct fields' do
+ data_fields << grade_entry_form_with_data.grade_entry_items.first.id.to_s
+ expect(response.parsed_body['data'][0].keys).to match_array(data_fields)
+ end
+ end
+ context 'a TA' do
+ let(:role) { create :ta }
+ it 'returns a 200 response' do
+ expect(response.status).to eq 200
+ end
+ context 'who has not been assigned a student' do
+ it 'returns data' do
+ expect(response.parsed_body['data'].length).to eq 0
+ end
+ end
+ context 'who has been assigned a student' do
+ let(:student) do
+ grade_entry_form_with_data.grade_entry_students.joins(role: :end_user).find_by('users.user_name': 'c8shosta')
+ end
+ let!(:grade_entry_student_ta) { create(:grade_entry_student_ta, ta: role, grade_entry_student: student) }
+ it 'returns data' do
+ get_as role, :populate_grades_table, params: { course_id: course.id, id: grade_entry_form_with_data.id }
+ expect(response.parsed_body['data'].length).to be > 0
+ end
+ it 'returns the number of students assigned to the ta' do
+ get_as role, :populate_grades_table, params: { course_id: course.id, id: grade_entry_form_with_data.id }
+ expect(response.parsed_body['data'].length).to eq role.grade_entry_students.count
+ end
+ it 'returns the correct set of students' do
+ get_as role, :populate_grades_table, params: { course_id: course.id, id: grade_entry_form_with_data.id }
+ students = role.grade_entry_students
+ .where(grade_entry_form: grade_entry_form_with_data)
+ .joins(role: :end_user).pluck('users.user_name')
+ expect(response.parsed_body['data'].map { |stu| stu['user_name'] }).to match_array(students)
+ end
+ end
+ end
+ end
end
diff --git a/spec/controllers/main_controller_spec.rb b/spec/controllers/main_controller_spec.rb
index 421098c1b0..89c11ea730 100644
--- a/spec/controllers/main_controller_spec.rb
+++ b/spec/controllers/main_controller_spec.rb
@@ -156,4 +156,30 @@
include_examples 'ta tests'
end
end
+ context 'when role switched' do
+ let(:course1) { create :course }
+ let(:course2) { create :course }
+ let(:instructor) { create :instructor, course_id: course1.id }
+ let(:instructor2) { create :instructor, course_id: course2.id }
+ let(:student) { create :student, course_id: course1.id }
+ before :each do
+ @controller = CoursesController.new
+ post_as instructor, :switch_role, params: { id: course1.id, effective_user_login: student.user_name }
+ end
+ it 'redirects the login route to the course homepage' do
+ @controller = MainController.new
+ get :login
+ expect(response).to redirect_to course_assignments_path(session[:role_switch_course_id])
+ end
+ it 'flashes a forbidden error message on attempt to access another course' do
+ @controller = CoursesController.new
+ get :show, params: { id: course2.id }
+ expect(flash[:error]).not_to be_empty
+ end
+ it 'redirects to the original course on attempt to access another course' do
+ @controller = CoursesController.new
+ get :show, params: { id: course2.id }
+ expect(response).to redirect_to course_assignments_path(session[:role_switch_course_id])
+ end
+ end
end
diff --git a/spec/controllers/results_controller_spec.rb b/spec/controllers/results_controller_spec.rb
index 47b5d0c169..b6750b00b9 100644
--- a/spec/controllers/results_controller_spec.rb
+++ b/spec/controllers/results_controller_spec.rb
@@ -669,6 +669,103 @@ def self.test_unauthorized(route_name)
test_assigns_not_nil :files
end
end
+
+ describe '#update_remark_request' do
+ let(:assignment) { create :assignment, assignment_properties_attributes: { allow_remarks: true } }
+ let(:grouping) { create :grouping_with_inviter, assignment: assignment }
+ let(:student) { grouping.inviter }
+ let(:submission) do
+ s = create :submission, grouping: grouping
+ s.get_original_result.update!(released_to_students: true)
+ s
+ end
+
+ context 'when saving a remark request message' do
+ let(:subject) do
+ patch_as student,
+ :update_remark_request,
+ params: { course_id: assignment.course_id,
+ submission_id: submission.id,
+ submission: { remark_request: 'Message' },
+ save: true }
+ end
+
+ before { subject }
+
+ it 'updates the submission remark request message' do
+ expect(submission.reload.remark_request).to eq 'Message'
+ end
+
+ it 'does not submit the remark request' do
+ expect(submission.reload.remark_result).to be_nil
+ end
+ end
+
+ context 'when submitting a remark request' do
+ let(:subject) do
+ patch_as student,
+ :update_remark_request,
+ params: { course_id: assignment.course_id,
+ submission_id: submission.id,
+ submission: { remark_request: 'Message' },
+ submit: true }
+ end
+
+ before { subject }
+
+ it 'updates the submission remark request message' do
+ expect(submission.reload.remark_request).to eq 'Message'
+ end
+
+ it 'submits the remark request' do
+ expect(submission.reload.remark_result).to_not be_nil
+ end
+
+ it 'unreleases the original result' do
+ expect(submission.get_original_result.reload.released_to_students).to be false
+ end
+ end
+ end
+
+ describe '#cancel_remark_request' do
+ let(:assignment) { create :assignment, assignment_properties_attributes: { allow_remarks: true } }
+ let(:grouping) { create :grouping_with_inviter, assignment: assignment }
+ let(:student) { grouping.inviter }
+ let(:submission) do
+ s = create :submission, grouping: grouping, remark_request: 'original message',
+ remark_request_timestamp: Time.current
+ s.make_remark_result
+ s.results.reload
+ s.remark_result.update!(marking_state: Result::MARKING_STATES[:incomplete])
+ s.get_original_result.update!(released_to_students: false)
+
+ s
+ end
+
+ let(:subject) do
+ delete_as student,
+ :cancel_remark_request,
+ params: { course_id: assignment.course_id,
+ id: submission.remark_result.id,
+ submission_id: submission.id }
+ end
+
+ before { subject }
+
+ it 'destroys the remark result' do
+ submission.non_pr_results.reload
+ expect(submission.remark_result).to be_nil
+ end
+
+ it 'releases the original result' do
+ expect(submission.get_original_result.reload.released_to_students).to be true
+ end
+
+ it 'redirects to the original result view' do
+ expect(response).to redirect_to view_marks_course_result_path(course_id: assignment.course_id,
+ id: submission.get_original_result.id)
+ end
+ end
end
context 'An instructor' do
before(:each) { sign_in instructor }
diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb
index c6da6cd31d..0a289f4cec 100644
--- a/spec/controllers/submissions_controller_spec.rb
+++ b/spec/controllers/submissions_controller_spec.rb
@@ -1,8 +1,5 @@
describe SubmissionsController do
# TODO: add 'role is from a different course' shared tests to each route test below
- after(:each) do
- destroy_repos
- end
let(:course) { Course.first || create(:course) }
shared_examples 'An authorized instructor and grader accessing #set_result_marking_state' do
context '#set_result_marking_state' do
@@ -184,6 +181,125 @@
expect(files['TestShapes.java']).to be_nil
end
end
+
+ context 'when creating a folder with required files' do
+ let(:tree) do
+ @grouping.group.access_repo do |repo|
+ repo.get_latest_revision.tree_at_path(@assignment.repository_folder)
+ end
+ end
+ before :each do
+ @assignment.update!(
+ only_required_files: true,
+ assignment_files_attributes: [{ filename: 'test_zip/zip_subdir/TestShapes.java' }]
+ )
+ end
+ it 'uploads a directory and returns a success' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip'] }
+ expect(response).to have_http_status :ok
+ end
+ it 'commits a single directory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip'] }
+ expect(tree['test_zip']).not_to be_nil
+ end
+ it 'uploads a subdirectory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip'] }
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip/zip_subdir'] }
+ expect(response).to have_http_status :ok
+ end
+ it 'commits a subdirectory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip'] }
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip/zip_subdir'] }
+ expect(tree['test_zip/zip_subdir']).not_to be_nil
+ end
+ context 'when testing with a git repo', :keep_memory_repos do
+ before(:each) { allow(Settings.repository).to receive(:type).and_return('git') }
+ after(:each) { FileUtils.rm_r(Dir.glob(File.join(Settings.repository.storage, '*'))) }
+ it 'displays a failure message when attempting to create a subdirectory with no parent' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['test_zip/zip_subdir'] }
+
+ expect(flash[:error]).to_not be_empty
+ end
+ end
+ it 'does not upload a non required directory and returns a failure' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['bad_folder'] }
+ expect(response).to have_http_status :unprocessable_entity
+ end
+ it 'does not commit the non required directory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['bad_folder'] }
+ expect(tree['bad_folder']).to be_nil
+ end
+ it 'does not upload a non required subdirectory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['bad_folder/bad_subdirectory'] }
+ expect(response).to have_http_status :unprocessable_entity
+ end
+ it 'does not commit a non required subdirectory' do
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_folders: ['bad_folder/bad_subdirectory'] }
+ expect(tree['bad_folder/bad_subdirectory']).to be_nil
+ end
+ end
+
+ context 'when folders are required and uploading a zip file' do
+ let(:unzip) { 'true' }
+ before :each do
+ @assignment.update!(
+ only_required_files: true,
+ assignment_files_attributes: [{ filename: 'test_zip/zip_subdir/TestShapes.java' },
+ { filename: 'test_zip/Shapes.java' }]
+ )
+ end
+
+ it 'should be able to create required folders' do
+ zip_file = fixture_file_upload('test_zip.zip', 'application/zip')
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_files: [zip_file], unzip: unzip }
+
+ expect(response).to have_http_status :ok
+ end
+ it 'uploads the outer directory' do
+ zip_file = fixture_file_upload('test_zip.zip', 'application/zip')
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_files: [zip_file], unzip: unzip }
+ tree = @grouping.group.access_repo do |repo|
+ repo.get_latest_revision.tree_at_path(@assignment.repository_folder)
+ end
+ expect(tree['test_zip']).not_to be_nil
+ end
+ it 'uploads the inner directory' do
+ zip_file = fixture_file_upload('test_zip.zip', 'application/zip')
+ post_as @student, :update_files,
+ params: { course_id: course.id, assignment_id: @assignment.id,
+ new_files: [zip_file], unzip: unzip }
+ tree = @grouping.group.access_repo do |repo|
+ repo.get_latest_revision.tree_at_path(@assignment.repository_folder)
+ end
+ expect(tree['test_zip/zip_subdir']).not_to be_nil
+ end
+ end
end
context 'uploading a zip file' do