<%= pf.fields_for :periods, penalty_decay_period do |f| %>
|
- <%= f.number_field :deduction, min: 0, step: :any, required: true %> %
+ <%= f.number_field :deduction, min: 0, step: :any, required: true %>
+ %
|
<%= f.number_field :interval, min: 0.001, step: :any, required: true %>
diff --git a/app/views/assignments/_penalty_period.html.erb b/app/views/assignments/_penalty_period.html.erb
index beee987208..c798b78ca9 100644
--- a/app/views/assignments/_penalty_period.html.erb
+++ b/app/views/assignments/_penalty_period.html.erb
@@ -25,7 +25,8 @@
|
- <%= f.number_field :deduction, min: 0, step: :any, required: true %> %
+ <%= f.number_field :deduction, min: 0, step: :any, required: true %>
+ %
|
<% if !f.object.nil? && !f.object.new_record? %>
diff --git a/app/views/assignments/_read.html.erb b/app/views/assignments/_read.html.erb
index 48bb261922..bb8a5fe8d0 100644
--- a/app/views/assignments/_read.html.erb
+++ b/app/views/assignments/_read.html.erb
@@ -93,12 +93,13 @@
<% end %>
<% elsif @assignment.submission_rule.type == "PenaltyDecayPeriodSubmissionRule" %>
+ <% suffix = @assignment.submission_rule.penalty_type || ExtraMark::PERCENTAGE %>
<% @assignment.submission_rule.periods.each do |p| %>
<% if p == @assignment.submission_rule.periods.first %>
- <%= t('penalty_decay_period_submission_rules.details_message_first',
+ <%= t("penalty_decay_period_submission_rules.details_message_first_#{suffix}",
deduction: p.deduction, interval: p.interval, hours: p.hours) %>
<% else %>
- <%= t('penalty_decay_period_submission_rules.details_message_other',
+ <%= t("penalty_decay_period_submission_rules.details_message_other_#{suffix}",
deduction: p.deduction, interval: p.interval, hours: p.hours) %>
<% end %>
<% end %>
@@ -107,7 +108,8 @@
<% @assignment.submission_rule.periods.each do |p| %>
<% deduction += p.deduction %>
<% hours += p.hours %>
- <%= t('penalty_period_submission_rules.details_message',
+ <% suffix = @assignment.submission_rule.penalty_type || ExtraMark::PERCENTAGE %>
+ <%= t("penalty_period_submission_rules.details_message_#{suffix}" ,
hours: hours, deduction: deduction) %>
<% end %>
<% end %>
diff --git a/app/views/groups/_assignment_group_use_modal.html.erb b/app/views/groups/_assignment_group_use_modal.html.erb
deleted file mode 100644
index 278fcae83d..0000000000
--- a/app/views/groups/_assignment_group_use_modal.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= content_for :modal_id, 'assignment_group_use_dialog' %>
-<%= content_for :modal_title, t('groups.reuse_groups') %>
-<%= content_for :modal_content do %>
- <%= form_tag use_another_assignment_groups_course_assignment_groups_path(@current_course, @assignment) do %>
- <%= label_tag :clone_assignment_id, t('groups.assignment_to_use') %>
- <%= select_tag :clone_assignment_id,
- options_for_select(
- @clone_assignments.map {|a| [a.short_identifier, a.id]}) %>
-
- <%= submit_tag t(:save),
- data: { disable_with: t(:working),
- confirm: t('groups.delete_groups_linked') } %>
- <%= button_tag t(:cancel), type: 'button', id: 'assignment-group-use-close' %>
-
- <% end %>
-<% end %>
diff --git a/app/views/groups/_create_group_modal.html.erb b/app/views/groups/_create_group_modal.html.erb
deleted file mode 100644
index 280b900e6b..0000000000
--- a/app/views/groups/_create_group_modal.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= content_for :modal_id, 'create_group_dialog' %>
-<%= content_for :modal_title, t('helpers.submit.create', model: Group.model_name.human) %>
-<%= content_for :modal_content do %>
- <%= form_tag new_course_assignment_group_path(@current_course, @assignment),
- method: :get,
- remote: true do %>
- <%= label_tag :new_group_name, Group.human_attribute_name(:group) %>
- <%= text_field_tag :new_group_name,
- '',
- autocomplete: 'off',
- maxlength: 30 %>
-
- <%= submit_tag t('helpers.submit.create', model: Group.model_name.human) %>
- <%= button_tag t(:cancel), id: 'modal-create-close' %>
-
- <% end %>
-<% end %>
diff --git a/app/views/groups/_rename_group_modal.html.erb b/app/views/groups/_rename_group_modal.html.erb
deleted file mode 100644
index 92ce4621fc..0000000000
--- a/app/views/groups/_rename_group_modal.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= content_for :modal_id, 'rename_group_dialog' %>
-<%= content_for :modal_title, t('groups.rename_group') %>
-<%= content_for :modal_content do %>
- <%= form_tag '', remote: true do %>
- <%= label_tag :new_groupname, Group.human_attribute_name(:group_name) %>
- <%= text_field_tag :new_groupname, '', maxlength: 30, autocomplete: 'off' %>
-
- <% end %>
-<% end %>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index ba92a1146a..42f8fb52be 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -15,18 +15,10 @@
groupMin: <%= @assignment.group_min %>,
scanned_exam: <%= @assignment.scanned_exam? %>,
timed: <%= @assignment.is_timed %>,
- current_duration: '<%= duration_string %>'
+ current_duration: '<%= duration_string %>',
+ vcs_submit: <%= @assignment.vcs_submit.to_json %>
}
);
-
- $('#assignment-group-use').click(function(e) {
- modalAssignmentGroupReUse.open();
- $('#assignment-group-use-close').click(function(e) {
- modalAssignmentGroupReUse.close();
- e.preventDefault();
- })
- e.preventDefault();
- })
});
<% end %>
<% end %>
@@ -41,20 +33,14 @@
<% end %>
<% content_for :additional_headings do %>
- <%# Allow cloning groups forward only if vcs submits are allowed for this assignment. %>
- <% if @assignment.vcs_submit %>
- <%= link_to t('groups.another_assignment_group'),
- '#',
- id: 'assignment-group-use' %>
-
- <% end %>
- <%= link_to t('download'), '#', id: 'downloadModal' %>
+
+ <%= link_to t('download'), '#', id: 'downloadModal' %>
+
+ <%= link_to t('upload'), '#', id: 'uploadModal' %>
+ <% if @assignment.scanned_exam %>
- <%= link_to t('upload'), '#', id: 'uploadModal' %>
- <% if @assignment.scanned_exam %>
-
- <%= link_to t('exam_templates.assign_scans.title'), :assign_scans_course_assignment_groups %>
- <% end %>
+ <%= link_to t('exam_templates.assign_scans.title'), :assign_scans_course_assignment_groups %>
+ <% end %>
<% end %>
@@ -63,7 +49,4 @@
<%= render partial: 'download_modal', layout: 'layouts/modal_dialog' %>
<%= render partial: 'upload_modal', layout: 'layouts/modal_dialog' %>
-<%= render partial: 'assignment_group_use_modal', layout: 'layouts/modal_dialog' %>
-<%= render partial: 'create_group_modal', layout: 'layouts/modal_dialog' %>
-<%= render partial: 'rename_group_modal', layout: 'layouts/modal_dialog' %>
diff --git a/app/views/lti_deployments/course_not_set_up.html.erb b/app/views/lti_deployments/course_not_set_up.html.erb
new file mode 100644
index 0000000000..94c464c454
--- /dev/null
+++ b/app/views/lti_deployments/course_not_set_up.html.erb
@@ -0,0 +1,4 @@
+
+ <%= t('lti.course_not_found') %>
+ <%= t('lti.course_not_set_up') %>
+
diff --git a/config/application.rb b/config/application.rb
index 0acc3b098b..2e558d88e4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,6 +35,9 @@ class Application < Rails::Application
# Do not add autoload paths to load path.
config.add_autoload_paths_to_load_path = false
+ # Add contracts directory to autoload paths
+ config.autoload_paths << Rails.root.join('app/contracts')
+
# Use RSpec as test framework
config.generators do |g|
g.test_framework :rspec
diff --git a/config/initializers/rails_performance.rb b/config/initializers/rails_performance.rb
index 6490700f54..03a3b6f071 100644
--- a/config/initializers/rails_performance.rb
+++ b/config/initializers/rails_performance.rb
@@ -4,6 +4,7 @@
if Settings.rails_performance.enabled
RailsPerformance::RailsPerformanceController.class_eval do
include SessionHandler
+
before_action :check_user_not_authorized
# Modify CSP for Performance Gem
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index 2466a9096d..00d785e039 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -1,7 +1,7 @@
# read MarkUs version from app/MARKUS_VERSION and set it as a configuration variable
class VersionReader
- VERSION_REGEX = /master|v\d+\.\d+\.\d+/.freeze
+ VERSION_REGEX = /master|v\d+\.\d+\.\d+/
def self.read_version
version_file = Rails.root.join('app/MARKUS_VERSION').expand_path
unless File.exist?(version_file)
diff --git a/config/locales/common/en.yml b/config/locales/common/en.yml
index 762f70df51..322f962453 100644
--- a/config/locales/common/en.yml
+++ b/config/locales/common/en.yml
@@ -26,7 +26,9 @@ en:
course_exists: A course with this name already exists on MarkUs. Please select a course to link to.
course_link_error: Unsuccessful. Please relaunch MarkUs from your LMS.
course_link_success: Success. %{markus_course_name} is now linked with your LMS.
+ course_not_found: Course Not Found
course_not_linked: This course has not been linked with an external course. To link this course with an external course, launch MarkUs from the external LMS.
+ course_not_set_up: This course has not been linked to MarkUs yet.
course_select_instructions: Match your course with a MarkUs course.
create_course: Create New Course
create_line_item_checkbox: Create gradebook item?
@@ -75,8 +77,10 @@ en:
select_filename: Select Filename
skip: Skip
table:
+ hide_details: Hide details
no_data: No rows found
search: Search
+ show_details: Show details
to: to
working: Loading
write: Write
diff --git a/config/locales/defaults/download_upload/en.yml b/config/locales/defaults/download_upload/en.yml
index a135aa5214..7532f0ca8e 100644
--- a/config/locales/defaults/download_upload/en.yml
+++ b/config/locales/defaults/download_upload/en.yml
@@ -8,6 +8,7 @@ en:
download_json: Download in JSON Format
download_the: Download %{item}
download_yml: Download in YML Format
+ download_zip: Download in ZIP Format
print_the: Print %{item}
rename: Rename
submit_the: Submit %{item}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 02a7b2e62a..2dc90a0f1f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -29,6 +29,7 @@ en:
required_files: Update the list of required files for assignment %{assignment}
timeout: Waited %{ms} milliseconds to access this repository. Please wait a few seconds and try again.
student:
+ inactive: " (inactive)"
submission:
all_files_submitted: Good job! All required files have been submitted.
conflicts: Conflicts
diff --git a/config/locales/models/test_group_results/en.yml b/config/locales/models/test_group_results/en.yml
index 8ef3d49257..59f55297d6 100644
--- a/config/locales/models/test_group_results/en.yml
+++ b/config/locales/models/test_group_results/en.yml
@@ -5,3 +5,4 @@ en:
test_group_result:
extra_info: Extra Info
no_test_results: No Test Results
+ timeout: timeout
diff --git a/config/locales/views/assignments/en.yml b/config/locales/views/assignments/en.yml
index 998e94f316..b95681d8a1 100644
--- a/config/locales/views/assignments/en.yml
+++ b/config/locales/views/assignments/en.yml
@@ -39,10 +39,15 @@ en:
scanned_exam:
under_review: This exam is still under review.
section_hidden:
- default: Default
+ default: Assignment visibility
hidden: Hidden
- hidden_option: If the section-specific settings option is checked, the value for individual sections will override this value.
+ hidden_option: If the section-specific settings option is checked, the value for individual sections will override this setting.
+ scheduled: Visible during scheduled time
visible: Visible
+ visible_from: Visible from
+ visible_from_placeholder: Leave empty for no start restriction
+ visible_until: Visible until
+ visible_until_placeholder: Leave empty for no end restriction
section_settings:
due_date: Section-specific Due Date
due_date_placeholder: Leave blank to use assignment due date.
diff --git a/config/locales/views/groups/en.yml b/config/locales/views/groups/en.yml
index 83dd7ff3c6..1dfb51543a 100644
--- a/config/locales/views/groups/en.yml
+++ b/config/locales/views/groups/en.yml
@@ -3,7 +3,6 @@ en:
groups:
add_all_groups: Create all groups
add_to_group: Add student(s) to group
- another_assignment_group: Use another assignment's groups
assign_over_limit: You have assigned more than the maximum number of students to group %{group}.
assigned_students: Assigned
assignment_to_use: Which assignments groups would you like to use?
diff --git a/config/locales/views/submission_rules/en.yml b/config/locales/views/submission_rules/en.yml
index f36d20b467..2c2fe4a888 100644
--- a/config/locales/views/submission_rules/en.yml
+++ b/config/locales/views/submission_rules/en.yml
@@ -15,23 +15,45 @@ en:
overtime_message_with_credits_left: The due date for this assignment has passed. However, you have %{grace_credits_remaining} grace credit(s) left. If you submit files during this period, you will be spending %{grace_credits_to_use} of those credits.
overtime_message_without_credits_left: The due date for this assignment has passed, and you do not have enough grace credits to submit new work.
penalty_decay_period_submission_rules:
- details_message_first: A deduction of %{deduction}% will be applied every %{interval} hours up to %{hours} hours after the assignment is due.
- details_message_other: Thereafter, a deduction of %{deduction}% will be applied every %{interval} hours up to a maximum of %{hours} hours.
- extramark_description: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction.
- overtime_message: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% deducted from the final mark on this assignment.
+ details_message_first_percentage: A deduction of %{deduction}% of the assignment total will be applied every %{interval} hours up to %{hours} hours after the assignment is due.
+ details_message_first_percentage_of_mark: A deduction of %{deduction}% of your earned mark will be applied every %{interval} hours up to %{hours} hours after the assignment is due.
+ details_message_first_points: A deduction of %{deduction} marks will be applied every %{interval} hours up to %{hours} hours after the assignment is due.
+ details_message_other_percentage: Thereafter, a deduction of %{deduction}% of the assignment total will be applied every %{interval} hours up to a maximum of %{hours} hours.
+ details_message_other_percentage_of_mark: Thereafter, a deduction of %{deduction}% of your earned mark will be applied every %{interval} hours up to a maximum of %{hours} hours.
+ details_message_other_points: Thereafter, a deduction of %{deduction} marks will be applied every %{interval} hours up to a maximum of %{hours} hours.
+ extramark_description_percentage: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction of the assignment total.
+ extramark_description_percentage_of_mark: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction from earned mark.
+ extramark_description_points: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount} marks deduction.
+ overtime_message_percentage: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% of the assignment total deducted from the final grade on this assignment.
+ overtime_message_percentage_of_mark: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% of your earned mark deducted from the final grade on this assignment.
+ overtime_message_points: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty} marks deducted from the final grade on this assignment.
penalty_period_submission_rules:
deadline_html: Due date including maximum late penalty
- details_message: Up to %{hours} hours after the due date, your grade will be reduced by %{deduction}%
- extramark_description: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction.
- overtime_message: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% deducted from the final mark on this assignment.
+ details_message_percentage: Up to %{hours} hours after the due date, your grade will be reduced by %{deduction}% of the assignment total from the final mark on this assignment.
+ details_message_percentage_of_mark: Up to %{hours} hours after the due date, your grade will be reduced by %{deduction}% of your earned mark from the final mark on this assignment.
+ details_message_points: Up to %{hours} hours after the due date, your grade will be reduced by %{deduction} marks from the final mark on this assignment.
+ extramark_description_percentage: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction of the assignment total.
+ extramark_description_percentage_of_mark: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount}% deduction from earned mark.
+ extramark_description_points: Late submission (%{overtime_hours} hour(s)) resulted in automatic %{penalty_amount} marks deduction.
+ overtime_message_percentage: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% of the assignment total deducted from the final grade on this assignment.
+ overtime_message_percentage_of_mark: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty}% of your earned mark deducted from the final grade on this assignment.
+ overtime_message_points: The due date for this assignment has passed and you are now in a penalty period. You can make changes to your submission, but will have %{potential_penalty} marks deducted from the final grade on this assignment.
submission_rules:
add_period: Add late period
deduct: deduction
+ deduction_unit:
+ marks: marks
+ percentage: "%"
errors:
not_valid_submission_rule: "%{type} is not a valid SubmissionRule"
every: every
for: for
from: from
hours: hour(s)
+ penalty_type: Penalty type
+ penalty_types:
+ marks: Marks
+ percentage: Percentage of assignment total
+ percentage_of_mark: Percentage of earned mark
period: period
to: to
diff --git a/config/routes.rb b/config/routes.rb
index d88ab5b198..13ccf02ad1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,6 +41,7 @@
put 'add_tag'
put 'remove_tag'
post 'collect_submission'
+ post 'add_test_run'
end
resources :submission_files, only: [:index, :create] do
collection do
@@ -526,6 +527,7 @@
member do
get 'choose_course'
post 'choose_course'
+ get 'course_not_set_up'
post 'create_course'
end
end
diff --git a/db/data/autotest_files/py/script_files/test2.py b/db/data/autotest_files/py/script_files/test2.py
index 4c84303af3..e7260bf692 100644
--- a/db/data/autotest_files/py/script_files/test2.py
+++ b/db/data/autotest_files/py/script_files/test2.py
@@ -60,6 +60,7 @@ def test_with_partial_credit(request):
def test_with_bonus(request):
- """This test gives the student a score of 3/2."""
+ """This test gives the student a score of 3/2 and assigns an extra mark"""
request.node.add_marker(pytest.mark.markus_marks_earned(3))
request.node.add_marker(pytest.mark.markus_marks_total(2))
+ request.node.add_marker(pytest.mark.markus_extra_marks(1, "This is an extra mark", "points"))
diff --git a/db/migrate/20251010150000_add_visibility_dates_to_assessments.rb b/db/migrate/20251010150000_add_visibility_dates_to_assessments.rb
new file mode 100644
index 0000000000..75e9b9add8
--- /dev/null
+++ b/db/migrate/20251010150000_add_visibility_dates_to_assessments.rb
@@ -0,0 +1,8 @@
+class AddVisibilityDatesToAssessments < ActiveRecord::Migration[7.1]
+ def change
+ add_column :assessments, :visible_on, :datetime
+ add_column :assessments, :visible_until, :datetime
+ add_column :assessment_section_properties, :visible_on, :datetime
+ add_column :assessment_section_properties, :visible_until, :datetime
+ end
+end
diff --git a/db/migrate/20251010150001_update_check_repo_permissions_for_datetime_visibility.rb b/db/migrate/20251010150001_update_check_repo_permissions_for_datetime_visibility.rb
new file mode 100644
index 0000000000..f5e96cc076
--- /dev/null
+++ b/db/migrate/20251010150001_update_check_repo_permissions_for_datetime_visibility.rb
@@ -0,0 +1,159 @@
+class UpdateCheckRepoPermissionsForDatetimeVisibility < ActiveRecord::Migration[7.1]
+ def up
+ # Drop and recreate the function with datetime visibility logic
+ execute <<-SQL
+ CREATE OR REPLACE FUNCTION public.check_repo_permissions(user_name_ character varying, course_name character varying, repo_name_ character varying) RETURNS boolean
+ LANGUAGE plpgsql
+ AS $$
+ DECLARE
+ role_type varchar;
+ role_id_ integer;
+ BEGIN
+ SELECT roles.id, roles.type
+ INTO role_id_, role_type
+ FROM users
+ JOIN roles ON roles.user_id=users.id
+ JOIN courses ON roles.course_id=courses.id
+ WHERE courses.name=course_name AND users.user_name=user_name_ AND roles.hidden=false
+ FETCH FIRST ROW ONLY;
+
+ IF role_type IN ('Instructor', 'AdminRole') THEN
+ RETURN true;
+ END IF;
+ IF role_type = 'Ta' THEN
+ RETURN EXISTS(
+ SELECT 1
+ FROM memberships
+ JOIN roles ON roles.id = memberships.role_id
+ JOIN groupings ON memberships.grouping_id = groupings.id
+ JOIN groups ON groupings.group_id = groups.id
+ JOIN assignment_properties ON assignment_properties.assessment_id = groupings.assessment_id
+ WHERE memberships.type = 'TaMembership'
+ AND assignment_properties.anonymize_groups = false
+ AND roles.id = role_id_
+ AND groups.repo_name = repo_name_
+ );
+ END IF;
+ IF role_type = 'Student' THEN
+ RETURN EXISTS(
+ SELECT roles.id
+ FROM memberships
+ JOIN roles ON roles.id=memberships.role_id
+ JOIN groupings ON memberships.grouping_id=groupings.id
+ JOIN groups ON groupings.group_id=groups.id
+ JOIN assignment_properties ON assignment_properties.assessment_id=groupings.assessment_id
+ JOIN assessments ON groupings.assessment_id=assessments.id
+ JOIN courses ON assessments.course_id=courses.id
+ LEFT OUTER JOIN assessment_section_properties ON assessment_section_properties.assessment_id=assessments.id
+ WHERE memberships.type='StudentMembership'
+ AND memberships.membership_status IN ('inviter','accepted')
+ AND assignment_properties.vcs_submit=true
+ AND roles.id=role_id_
+ AND courses.is_hidden=false
+ AND groups.repo_name=repo_name_
+ -- Datetime visibility logic: section-specific overrides global
+ AND (
+ -- Section-specific visibility (when any section property is set)
+ ((assessment_section_properties.is_hidden IS NOT NULL OR
+ assessment_section_properties.visible_on IS NOT NULL OR
+ assessment_section_properties.visible_until IS NOT NULL) AND (
+ -- If datetime columns are set, check datetime range
+ ((assessment_section_properties.visible_on IS NOT NULL OR assessment_section_properties.visible_until IS NOT NULL) AND
+ (assessment_section_properties.visible_on IS NULL OR assessment_section_properties.visible_on <= NOW()) AND
+ (assessment_section_properties.visible_until IS NULL OR assessment_section_properties.visible_until >= NOW()))
+ OR
+ -- Otherwise use is_hidden
+ ((assessment_section_properties.visible_on IS NULL AND assessment_section_properties.visible_until IS NULL) AND
+ assessment_section_properties.is_hidden=false)
+ ))
+ OR
+ -- Global visibility (no section properties set)
+ (assessment_section_properties.is_hidden IS NULL AND
+ assessment_section_properties.visible_on IS NULL AND
+ assessment_section_properties.visible_until IS NULL AND (
+ -- If datetime columns are set, check datetime range
+ ((assessments.visible_on IS NOT NULL OR assessments.visible_until IS NOT NULL) AND
+ (assessments.visible_on IS NULL OR assessments.visible_on <= NOW()) AND
+ (assessments.visible_until IS NULL OR assessments.visible_until >= NOW()))
+ OR
+ -- Otherwise use is_hidden
+ ((assessments.visible_on IS NULL AND assessments.visible_until IS NULL) AND
+ assessments.is_hidden=false)
+ ))
+ )
+ AND (assignment_properties.is_timed=false
+ OR groupings.start_time IS NOT NULL
+ OR (groupings.start_time IS NULL AND assessments.due_date= NOW()))
+ OR
+ -- Otherwise use is_hidden
+ ((assessment_section_properties.visible_on IS NULL AND assessment_section_properties.visible_until IS NULL) AND
+ assessment_section_properties.is_hidden=false)
+ ))
+ OR
+ -- Global visibility (no section properties set)
+ (assessment_section_properties.is_hidden IS NULL AND
+ assessment_section_properties.visible_on IS NULL AND
+ assessment_section_properties.visible_until IS NULL AND (
+ -- If datetime columns are set, check datetime range
+ ((assessments.visible_on IS NOT NULL OR assessments.visible_until IS NOT NULL) AND
+ (assessments.visible_on IS NULL OR assessments.visible_on <= NOW()) AND
+ (assessments.visible_until IS NULL OR assessments.visible_until >= NOW()))
+ OR
+ -- Otherwise use is_hidden
+ ((assessments.visible_on IS NULL AND assessments.visible_until IS NULL) AND
+ assessments.is_hidden=false)
+ ))
+ )
+ AND (assignment_properties.is_timed=false
+ OR groupings.start_time IS NOT NULL
+ OR (groupings.start_time IS NULL AND assessments.due_date 0
+ puts "Found #{count} orphaned EndUser records. Deleting..."
+ puts '--- Users to be removed ---'
+ orphaned_end_users.each do |user|
+ puts user.user_name
+ end
+ puts '---------------------------'
+ orphaned_end_users.destroy_all
+ puts 'Pruning complete.'
+ else
+ puts 'No orphaned EndUser records found.'
+ end
+ end
end
diff --git a/package-lock.json b/package-lock.json
index 65cd8c1953..0b99ae86d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,13 +6,13 @@
"": {
"name": "MarkUs",
"dependencies": {
- "@babel/runtime": "^7.28.2",
+ "@babel/runtime": "^7.28.4",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
- "@rails/actioncable": "^8.0.200",
+ "@rails/actioncable": "^8.0.201",
"@rails/ujs": "^7.1.3-4",
"@rjsf/core": "^5.24.12",
"@rjsf/validator-ajv8": "^5.24.12",
@@ -39,6 +39,7 @@
"react-dom": "^18.3.1",
"react-flatpickr": "^4.0.11",
"react-keyed-file-browser": "^1.14.0",
+ "react-loader-spinner": "6.1.6",
"react-modal": "^3.16.3",
"react-table": "^6.11.5",
"react-tabs": "^6.1.0",
@@ -46,10 +47,10 @@
"ui-contextmenu": "^1.18.1"
},
"devDependencies": {
- "@babel/core": "^7.28.0",
- "@babel/plugin-transform-runtime": "^7.28.0",
- "@babel/preset-env": "^7.28.0",
- "@babel/preset-react": "^7.27.1",
+ "@babel/core": "^7.28.5",
+ "@babel/plugin-transform-runtime": "^7.28.5",
+ "@babel/preset-env": "^7.28.5",
+ "@babel/preset-react": "^7.28.5",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.3.0",
@@ -77,19 +78,6 @@
"integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==",
"dev": true
},
- "node_modules/@ampproject/remapping": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
- "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
- "dev": true,
- "dependencies": {
- "@jridgewell/gen-mapping": "^0.1.0",
- "@jridgewell/trace-mapping": "^0.3.9"
- },
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@asamuzakjp/css-color": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
@@ -120,30 +108,32 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
- "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+ "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
- "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+ "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.27.1",
- "@babel/generator": "^7.28.0",
+ "@babel/generator": "^7.28.5",
"@babel/helper-compilation-targets": "^7.27.2",
- "@babel/helper-module-transforms": "^7.27.3",
- "@babel/helpers": "^7.27.6",
- "@babel/parser": "^7.28.0",
+ "@babel/helper-module-transforms": "^7.28.3",
+ "@babel/helpers": "^7.28.4",
+ "@babel/parser": "^7.28.5",
"@babel/template": "^7.27.2",
- "@babel/traverse": "^7.28.0",
- "@babel/types": "^7.28.0",
+ "@babel/traverse": "^7.28.5",
+ "@babel/types": "^7.28.5",
+ "@jridgewell/remapping": "^2.3.5",
"convert-source-map": "^2.0.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -159,13 +149,14 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
- "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+ "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/parser": "^7.28.0",
- "@babel/types": "^7.28.0",
+ "@babel/parser": "^7.28.5",
+ "@babel/types": "^7.28.5",
"@jridgewell/gen-mapping": "^0.3.12",
"@jridgewell/trace-mapping": "^0.3.28",
"jsesc": "^3.0.2"
@@ -174,16 +165,6 @@
"node": ">=6.9.0"
}
},
- "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.12",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
- "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
- "dev": true,
- "dependencies": {
- "@jridgewell/sourcemap-codec": "^1.5.0",
- "@jridgewell/trace-mapping": "^0.3.24"
- }
- },
"node_modules/@babel/helper-annotate-as-pure": {
"version": "7.27.3",
"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
@@ -229,18 +210,18 @@
"dev": true
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
- "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz",
+ "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-annotate-as-pure": "^7.27.3",
"@babel/helper-member-expression-to-functions": "^7.27.1",
"@babel/helper-optimise-call-expression": "^7.27.1",
"@babel/helper-replace-supers": "^7.27.1",
"@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
- "@babel/traverse": "^7.27.1",
+ "@babel/traverse": "^7.28.3",
"semver": "^6.3.1"
},
"engines": {
@@ -322,15 +303,15 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.27.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
- "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+ "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-imports": "^7.27.1",
"@babel/helper-validator-identifier": "^7.27.1",
- "@babel/traverse": "^7.27.3"
+ "@babel/traverse": "^7.28.3"
},
"engines": {
"node": ">=6.9.0"
@@ -423,9 +404,9 @@
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
- "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+ "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
"dev": true,
"license": "MIT",
"engines": {
@@ -458,25 +439,27 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.27.6",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
- "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+ "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/template": "^7.27.2",
- "@babel/types": "^7.27.6"
+ "@babel/types": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/parser": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
- "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+ "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/types": "^7.28.0"
+ "@babel/types": "^7.28.5"
},
"bin": {
"parser": "bin/babel-parser.js"
@@ -486,14 +469,14 @@
}
},
"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
- "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+ "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
- "@babel/traverse": "^7.27.1"
+ "@babel/traverse": "^7.28.5"
},
"engines": {
"node": ">=6.9.0"
@@ -553,14 +536,14 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
- "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz",
+ "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
- "@babel/traverse": "^7.27.1"
+ "@babel/traverse": "^7.28.3"
},
"engines": {
"node": ">=6.9.0"
@@ -906,10 +889,11 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.0.tgz",
- "integrity": "sha512-gKKnwjpdx5sER/wl0WN0efUBFzF/56YZO0RJrSYP4CljXnP31ByY7fol89AzomdlLNzI36AvOTmYHsnZTCkq8Q==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz",
+ "integrity": "sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
},
@@ -938,13 +922,13 @@
}
},
"node_modules/@babel/plugin-transform-class-static-block": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
- "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
+ "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.27.1",
+ "@babel/helper-create-class-features-plugin": "^7.28.3",
"@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
@@ -955,17 +939,18 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.0.tgz",
- "integrity": "sha512-IjM1IoJNw72AZFlj33Cu8X0q2XK/6AaVC3jQu+cgQ5lThWD5ajnuUAml80dqRmOhmPkTH8uAwnpMu9Rvj0LTRA==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
+ "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.27.3",
"@babel/helper-compilation-targets": "^7.27.2",
"@babel/helper-globals": "^7.28.0",
"@babel/helper-plugin-utils": "^7.27.1",
"@babel/helper-replace-supers": "^7.27.1",
- "@babel/traverse": "^7.28.0"
+ "@babel/traverse": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
@@ -992,13 +977,14 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
- "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+ "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
- "@babel/traverse": "^7.28.0"
+ "@babel/traverse": "^7.28.5"
},
"engines": {
"node": ">=6.9.0"
@@ -1090,9 +1076,9 @@
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
- "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.5.tgz",
+ "integrity": "sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1189,9 +1175,9 @@
}
},
"node_modules/@babel/plugin-transform-logical-assignment-operators": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
- "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz",
+ "integrity": "sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1255,16 +1241,16 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
- "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz",
+ "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.27.1",
+ "@babel/helper-module-transforms": "^7.28.3",
"@babel/helper-plugin-utils": "^7.27.1",
- "@babel/helper-validator-identifier": "^7.27.1",
- "@babel/traverse": "^7.27.1"
+ "@babel/helper-validator-identifier": "^7.28.5",
+ "@babel/traverse": "^7.28.5"
},
"engines": {
"node": ">=6.9.0"
@@ -1356,16 +1342,17 @@
}
},
"node_modules/@babel/plugin-transform-object-rest-spread": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.0.tgz",
- "integrity": "sha512-9VNGikXxzu5eCiQjdE4IZn8sb9q7Xsk5EXLDBKUYg1e/Tve8/05+KJEtcxGxAgCY5t/BpKQM+JEL/yT4tvgiUA==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
+ "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-compilation-targets": "^7.27.2",
"@babel/helper-plugin-utils": "^7.27.1",
"@babel/plugin-transform-destructuring": "^7.28.0",
"@babel/plugin-transform-parameters": "^7.27.7",
- "@babel/traverse": "^7.28.0"
+ "@babel/traverse": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
@@ -1408,9 +1395,9 @@
}
},
"node_modules/@babel/plugin-transform-optional-chaining": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
- "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz",
+ "integrity": "sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1429,6 +1416,7 @@
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
"integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
},
@@ -1491,9 +1479,9 @@
}
},
"node_modules/@babel/plugin-transform-react-display-name": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.27.1.tgz",
- "integrity": "sha512-p9+Vl3yuHPmkirRrg021XiP+EETmPMQTLr6Ayjj85RLNEbb3Eya/4VI0vAdzQG9SEAl2Lnt7fy5lZyMzjYoZQQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+ "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1560,10 +1548,11 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.0.tgz",
- "integrity": "sha512-LOAozRVbqxEVjSKfhGnuLoE4Kz4Oc5UJzuvFUhSsQzdCdaAQu06mG8zDv2GFSerM62nImUZ7K92vxnQcLSDlCQ==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
+ "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
},
@@ -1608,10 +1597,11 @@
}
},
"node_modules/@babel/plugin-transform-runtime": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.0.tgz",
- "integrity": "sha512-dGopk9nZrtCs2+nfIem25UuHyt5moSJamArzIoh9/vezUQPmYDOzjaHDCkAzuGJibCIkPup8rMT2+wYB6S73cA==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.5.tgz",
+ "integrity": "sha512-20NUVgOrinudkIBzQ2bNxP08YpKprUkRTiRSd2/Z5GOdPImJGkoN4Z7IQe1T5AdyKI1i5L6RBmluqdSzvaq9/w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-module-imports": "^7.27.1",
"@babel/helper-plugin-utils": "^7.27.1",
@@ -1776,20 +1766,21 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.0.tgz",
- "integrity": "sha512-VmaxeGOwuDqzLl5JUkIRM1X2Qu2uKGxHEQWh+cvvbl7JuJRgKGJSfsEF/bUaxFhJl/XAyxBe7q7qSuTbKFuCyg==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.5.tgz",
+ "integrity": "sha512-S36mOoi1Sb6Fz98fBfE+UZSpYw5mJm0NUHtIKrOuNcqeFauy1J6dIvXm2KRVKobOSaGq4t/hBXdN4HGU3wL9Wg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.28.0",
+ "@babel/compat-data": "^7.28.5",
"@babel/helper-compilation-targets": "^7.27.2",
"@babel/helper-plugin-utils": "^7.27.1",
"@babel/helper-validator-option": "^7.27.1",
- "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
- "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.27.1",
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3",
"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
"@babel/plugin-syntax-import-assertions": "^7.27.1",
"@babel/plugin-syntax-import-attributes": "^7.27.1",
@@ -1798,42 +1789,42 @@
"@babel/plugin-transform-async-generator-functions": "^7.28.0",
"@babel/plugin-transform-async-to-generator": "^7.27.1",
"@babel/plugin-transform-block-scoped-functions": "^7.27.1",
- "@babel/plugin-transform-block-scoping": "^7.28.0",
+ "@babel/plugin-transform-block-scoping": "^7.28.5",
"@babel/plugin-transform-class-properties": "^7.27.1",
- "@babel/plugin-transform-class-static-block": "^7.27.1",
- "@babel/plugin-transform-classes": "^7.28.0",
+ "@babel/plugin-transform-class-static-block": "^7.28.3",
+ "@babel/plugin-transform-classes": "^7.28.4",
"@babel/plugin-transform-computed-properties": "^7.27.1",
- "@babel/plugin-transform-destructuring": "^7.28.0",
+ "@babel/plugin-transform-destructuring": "^7.28.5",
"@babel/plugin-transform-dotall-regex": "^7.27.1",
"@babel/plugin-transform-duplicate-keys": "^7.27.1",
"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
"@babel/plugin-transform-dynamic-import": "^7.27.1",
"@babel/plugin-transform-explicit-resource-management": "^7.28.0",
- "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
+ "@babel/plugin-transform-exponentiation-operator": "^7.28.5",
"@babel/plugin-transform-export-namespace-from": "^7.27.1",
"@babel/plugin-transform-for-of": "^7.27.1",
"@babel/plugin-transform-function-name": "^7.27.1",
"@babel/plugin-transform-json-strings": "^7.27.1",
"@babel/plugin-transform-literals": "^7.27.1",
- "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+ "@babel/plugin-transform-logical-assignment-operators": "^7.28.5",
"@babel/plugin-transform-member-expression-literals": "^7.27.1",
"@babel/plugin-transform-modules-amd": "^7.27.1",
"@babel/plugin-transform-modules-commonjs": "^7.27.1",
- "@babel/plugin-transform-modules-systemjs": "^7.27.1",
+ "@babel/plugin-transform-modules-systemjs": "^7.28.5",
"@babel/plugin-transform-modules-umd": "^7.27.1",
"@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
"@babel/plugin-transform-new-target": "^7.27.1",
"@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
"@babel/plugin-transform-numeric-separator": "^7.27.1",
- "@babel/plugin-transform-object-rest-spread": "^7.28.0",
+ "@babel/plugin-transform-object-rest-spread": "^7.28.4",
"@babel/plugin-transform-object-super": "^7.27.1",
"@babel/plugin-transform-optional-catch-binding": "^7.27.1",
- "@babel/plugin-transform-optional-chaining": "^7.27.1",
+ "@babel/plugin-transform-optional-chaining": "^7.28.5",
"@babel/plugin-transform-parameters": "^7.27.7",
"@babel/plugin-transform-private-methods": "^7.27.1",
"@babel/plugin-transform-private-property-in-object": "^7.27.1",
"@babel/plugin-transform-property-literals": "^7.27.1",
- "@babel/plugin-transform-regenerator": "^7.28.0",
+ "@babel/plugin-transform-regenerator": "^7.28.4",
"@babel/plugin-transform-regexp-modifiers": "^7.27.1",
"@babel/plugin-transform-reserved-words": "^7.27.1",
"@babel/plugin-transform-shorthand-properties": "^7.27.1",
@@ -1874,15 +1865,15 @@
}
},
"node_modules/@babel/preset-react": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.27.1.tgz",
- "integrity": "sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.28.5.tgz",
+ "integrity": "sha512-Z3J8vhRq7CeLjdC58jLv4lnZ5RKFUJWqH5emvxmv9Hv3BD1T9R/Im713R4MTKwvFaV74ejZ3sM01LyEKk4ugNQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
"@babel/helper-validator-option": "^7.27.1",
- "@babel/plugin-transform-react-display-name": "^7.27.1",
+ "@babel/plugin-transform-react-display-name": "^7.28.0",
"@babel/plugin-transform-react-jsx": "^7.27.1",
"@babel/plugin-transform-react-jsx-development": "^7.27.1",
"@babel/plugin-transform-react-pure-annotations": "^7.27.1"
@@ -1895,9 +1886,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.28.2",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
- "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+ "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
@@ -1919,17 +1910,18 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
- "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+ "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.27.1",
- "@babel/generator": "^7.28.0",
+ "@babel/generator": "^7.28.5",
"@babel/helper-globals": "^7.28.0",
- "@babel/parser": "^7.28.0",
+ "@babel/parser": "^7.28.5",
"@babel/template": "^7.27.2",
- "@babel/types": "^7.28.0",
+ "@babel/types": "^7.28.5",
"debug": "^4.3.1"
},
"engines": {
@@ -1937,13 +1929,14 @@
}
},
"node_modules/@babel/types": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
- "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
+ "version": "7.28.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+ "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/helper-string-parser": "^7.27.1",
- "@babel/helper-validator-identifier": "^7.27.1"
+ "@babel/helper-validator-identifier": "^7.28.5"
},
"engines": {
"node": ">=6.9.0"
@@ -2114,6 +2107,27 @@
"tslib": "^2.4.0"
}
},
+ "node_modules/@emotion/is-prop-valid": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
+ "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
+ "license": "MIT",
+ "dependencies": {
+ "@emotion/memoize": "^0.8.1"
+ }
+ },
+ "node_modules/@emotion/memoize": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==",
+ "license": "MIT"
+ },
+ "node_modules/@emotion/unitless": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+ "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==",
+ "license": "MIT"
+ },
"node_modules/@fortawesome/fontawesome-common-types": {
"version": "6.7.2",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz",
@@ -2723,16 +2737,25 @@
}
},
"node_modules/@jridgewell/gen-mapping": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
- "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+ "version": "0.3.13",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+ "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@jridgewell/set-array": "^1.0.0",
- "@jridgewell/sourcemap-codec": "^1.4.10"
- },
- "engines": {
- "node": ">=6.0.0"
+ "@jridgewell/sourcemap-codec": "^1.5.0",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ }
+ },
+ "node_modules/@jridgewell/remapping": {
+ "version": "2.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+ "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.24"
}
},
"node_modules/@jridgewell/resolve-uri": {
@@ -2744,15 +2767,6 @@
"node": ">=6.0.0"
}
},
- "node_modules/@jridgewell/set-array": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
- "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
- "dev": true,
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@jridgewell/source-map": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
@@ -2764,21 +2778,6 @@
"@jridgewell/trace-mapping": "^0.3.25"
}
},
- "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
- "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@jridgewell/set-array": "^1.2.1",
- "@jridgewell/sourcemap-codec": "^1.4.10",
- "@jridgewell/trace-mapping": "^0.3.24"
- },
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@jridgewell/sourcemap-codec": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
@@ -3344,9 +3343,9 @@
}
},
"node_modules/@rails/actioncable": {
- "version": "8.0.200",
- "resolved": "https://registry.npmjs.org/@rails/actioncable/-/actioncable-8.0.200.tgz",
- "integrity": "sha512-EDqWyxck22BHmv1e+mD8Kl6GmtNkhEPdRfGFT7kvsv1yoXd9iYrqHDVAaR8bKmU/syC5eEZ2I5aWWxtB73ukMw==",
+ "version": "8.0.201",
+ "resolved": "https://registry.npmjs.org/@rails/actioncable/-/actioncable-8.0.201.tgz",
+ "integrity": "sha512-WiXZodvnK7u+wlu72DZydfV75x14HhzXI84sto9xcdsW1DMOHK+jYwQuuE/Wh/hKH5yajFIw/3DUP6MHDeGrbA==",
"license": "MIT"
},
"node_modules/@rails/ujs": {
@@ -3760,31 +3759,25 @@
"integrity": "sha512-GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ==",
"devOptional": true
},
- "node_modules/@types/prop-types": {
- "version": "15.7.5",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
- "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
- },
"node_modules/@types/react": {
- "version": "18.3.18",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
- "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
+ "version": "19.1.10",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.10.tgz",
+ "integrity": "sha512-EhBeSYX0Y6ye8pNebpKrwFJq7BoQ8J5SO6NlvNwwHjSj6adXJViPQrKlsyPw7hLBLvckEMO1yxeGdR82YBBlDg==",
"license": "MIT",
"dependencies": {
- "@types/prop-types": "*",
"csstype": "^3.0.2"
}
},
"node_modules/@types/react-dom": {
- "version": "18.3.5",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
- "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+ "version": "19.1.7",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.7.tgz",
+ "integrity": "sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"peerDependencies": {
- "@types/react": "^18.0.0"
+ "@types/react": "^19.0.0"
}
},
"node_modules/@types/react-table": {
@@ -3802,6 +3795,12 @@
"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
"dev": true
},
+ "node_modules/@types/stylis": {
+ "version": "4.2.5",
+ "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz",
+ "integrity": "sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==",
+ "license": "MIT"
+ },
"node_modules/@types/tough-cookie": {
"version": "4.0.5",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
@@ -4777,6 +4776,15 @@
"node": ">=6"
}
},
+ "node_modules/camelize": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
+ "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/caniuse-lite": {
"version": "1.0.30001726",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
@@ -5059,6 +5067,15 @@
"node": ">= 8"
}
},
+ "node_modules/css-color-keywords": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+ "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+ "license": "ISC",
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/css-loader": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
@@ -5107,6 +5124,17 @@
"node": ">=10"
}
},
+ "node_modules/css-to-react-native": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+ "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+ "license": "MIT",
+ "dependencies": {
+ "camelize": "^1.0.0",
+ "css-color-keywords": "^1.0.0",
+ "postcss-value-parser": "^4.0.2"
+ }
+ },
"node_modules/css.escape": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
@@ -5146,9 +5174,10 @@
}
},
"node_modules/csstype": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
- "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+ "license": "MIT"
},
"node_modules/data-urls": {
"version": "5.0.0",
@@ -6944,10 +6973,11 @@
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
},
"node_modules/js-yaml": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
- "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+ "version": "3.14.2",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+ "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
@@ -7699,8 +7729,7 @@
"node_modules/picocolors": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
- "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
- "dev": true
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
},
"node_modules/picomatch": {
"version": "2.3.1",
@@ -7736,10 +7765,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.33",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
- "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
- "dev": true,
+ "version": "8.4.49",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+ "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
"funding": [
{
"type": "opencollective",
@@ -7754,10 +7782,11 @@
"url": "https://github.com/sponsors/ai"
}
],
+ "license": "MIT",
"dependencies": {
"nanoid": "^3.3.7",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
},
"engines": {
"node": "^10 || ^12 || >=14"
@@ -7838,8 +7867,7 @@
"node_modules/postcss-value-parser": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
- "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
- "dev": true
+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
},
"node_modules/pretty-format": {
"version": "30.0.5",
@@ -8072,6 +8100,29 @@
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
+ "node_modules/react-loader-spinner": {
+ "version": "6.1.6",
+ "resolved": "https://registry.npmjs.org/react-loader-spinner/-/react-loader-spinner-6.1.6.tgz",
+ "integrity": "sha512-x5h1Jcit7Qn03MuKlrWcMG9o12cp9SNDVHVJTNRi9TgtGPKcjKiXkou4NRfLAtXaFB3+Z8yZsVzONmPzhv2ErA==",
+ "license": "MIT",
+ "dependencies": {
+ "react-is": "^18.2.0",
+ "styled-components": "^6.1.2"
+ },
+ "engines": {
+ "node": ">= 12"
+ },
+ "peerDependencies": {
+ "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
+ "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
+ }
+ },
+ "node_modules/react-loader-spinner/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "license": "MIT"
+ },
"node_modules/react-modal": {
"version": "3.16.3",
"resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz",
@@ -8460,6 +8511,12 @@
"node": ">=8"
}
},
+ "node_modules/shallowequal": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+ "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
+ "license": "MIT"
+ },
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -8507,10 +8564,10 @@
}
},
"node_modules/source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
- "dev": true,
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
@@ -8670,6 +8727,46 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/styled-components": {
+ "version": "6.1.19",
+ "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.19.tgz",
+ "integrity": "sha512-1v/e3Dl1BknC37cXMhwGomhO8AkYmN41CqyX9xhUDxry1ns3BFQy2lLDRQXJRdVVWB9OHemv/53xaStimvWyuA==",
+ "license": "MIT",
+ "dependencies": {
+ "@emotion/is-prop-valid": "1.2.2",
+ "@emotion/unitless": "0.8.1",
+ "@types/stylis": "4.2.5",
+ "css-to-react-native": "3.2.0",
+ "csstype": "3.1.3",
+ "postcss": "8.4.49",
+ "shallowequal": "1.1.0",
+ "stylis": "4.3.2",
+ "tslib": "2.6.2"
+ },
+ "engines": {
+ "node": ">= 16"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/styled-components"
+ },
+ "peerDependencies": {
+ "react": ">= 16.8.0",
+ "react-dom": ">= 16.8.0"
+ }
+ },
+ "node_modules/styled-components/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "license": "0BSD"
+ },
+ "node_modules/stylis": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz",
+ "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==",
+ "license": "MIT"
+ },
"node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
diff --git a/package.json b/package.json
index 7b661255d8..15f53fc0f8 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
{
"name": "MarkUs",
"dependencies": {
- "@babel/runtime": "^7.28.2",
+ "@babel/runtime": "^7.28.4",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
- "@rails/actioncable": "^8.0.200",
+ "@rails/actioncable": "^8.0.201",
"@rails/ujs": "^7.1.3-4",
"@rjsf/core": "^5.24.12",
"@rjsf/validator-ajv8": "^5.24.12",
@@ -34,6 +34,7 @@
"react-dom": "^18.3.1",
"react-flatpickr": "^4.0.11",
"react-keyed-file-browser": "^1.14.0",
+ "react-loader-spinner": "6.1.6",
"react-modal": "^3.16.3",
"react-table": "^6.11.5",
"react-tabs": "^6.1.0",
@@ -41,10 +42,10 @@
"ui-contextmenu": "^1.18.1"
},
"devDependencies": {
- "@babel/core": "^7.28.0",
- "@babel/plugin-transform-runtime": "^7.28.0",
- "@babel/preset-env": "^7.28.0",
- "@babel/preset-react": "^7.27.1",
+ "@babel/core": "^7.28.5",
+ "@babel/plugin-transform-runtime": "^7.28.5",
+ "@babel/preset-env": "^7.28.5",
+ "@babel/preset-react": "^7.28.5",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.3.0",
diff --git a/requirements-jupyter.txt b/requirements-jupyter.txt
index bd6a4ff7d1..1c8a4e5cf0 100644
--- a/requirements-jupyter.txt
+++ b/requirements-jupyter.txt
@@ -1,3 +1,3 @@
# TODO: replace requirements files with Pipfile file (when it is stable and supported by pip)
nbconvert==7.16.6
-playwright==1.54.0
+playwright==1.56.0
diff --git a/spec/controllers/admin/courses_controller_spec.rb b/spec/controllers/admin/courses_controller_spec.rb
index 6d8b572ca3..b813d2900a 100644
--- a/spec/controllers/admin/courses_controller_spec.rb
+++ b/spec/controllers/admin/courses_controller_spec.rb
@@ -285,7 +285,7 @@
context 'there is no autotest_setting set' do
it 'should return unprocessable_entity' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -331,7 +331,7 @@
context 'there is no autotest_setting set' do
it 'should return unprocessable_entity' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/api/assignments_controller_spec.rb b/spec/controllers/api/assignments_controller_spec.rb
index 40dac04557..63e7689ff0 100644
--- a/spec/controllers/api/assignments_controller_spec.rb
+++ b/spec/controllers/api/assignments_controller_spec.rb
@@ -347,7 +347,7 @@
context 'missing short_id' do
it 'should respond with 422' do
post :create, params: params.slice(:description, :due_date, :course_id)
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not create an assignment' do
@@ -359,7 +359,7 @@
context 'missing description' do
it 'should respond with 404' do
post :create, params: params.slice(:short_identifier, :due_date, :course_id)
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not create an assignment' do
@@ -371,7 +371,7 @@
context 'missing due_date' do
it 'should respond with 404' do
post :create, params: params.slice(:short_identifier, :description, :course_id)
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not create an assignment' do
@@ -545,7 +545,7 @@
expect(autotest_settings_for(assignment)).to eq({})
end
- it('should not be successful') { expect(response).to have_http_status :unprocessable_entity }
+ it('should not be successful') { expect(response).to have_http_status :unprocessable_content }
end
it 'should fail if the assignment does not exist' do
@@ -757,7 +757,7 @@
it 'responds with 422' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it_behaves_like 'does not submit'
@@ -775,7 +775,7 @@
it 'responds with 422' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'does not create a temporary file' do
diff --git a/spec/controllers/api/courses_controller_spec.rb b/spec/controllers/api/courses_controller_spec.rb
index 6d7b76f40a..05fcf8064a 100644
--- a/spec/controllers/api/courses_controller_spec.rb
+++ b/spec/controllers/api/courses_controller_spec.rb
@@ -386,7 +386,7 @@
context 'there is no autotest_setting set' do
it 'should return unprocessable_entity' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -432,7 +432,7 @@
context 'there is no autotest_setting set' do
it 'should return unprocessable_entity' do
subject
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/api/feedback_files_controller_spec.rb b/spec/controllers/api/feedback_files_controller_spec.rb
index 40d1452032..841603b998 100644
--- a/spec/controllers/api/feedback_files_controller_spec.rb
+++ b/spec/controllers/api/feedback_files_controller_spec.rb
@@ -192,7 +192,7 @@
post :create, params: { group_id: grouping.group.id, assignment_id: grouping.assignment.id,
filename: filename, mime_type: 'text/plain',
file_content: file_content, course_id: course.id }
- expect(response).to have_http_status :payload_too_large
+ expect(response).to have_http_status :content_too_large
end
end
end
diff --git a/spec/controllers/api/grade_entry_forms_controller_spec.rb b/spec/controllers/api/grade_entry_forms_controller_spec.rb
index 14b58df55f..69f57d0b0f 100644
--- a/spec/controllers/api/grade_entry_forms_controller_spec.rb
+++ b/spec/controllers/api/grade_entry_forms_controller_spec.rb
@@ -268,7 +268,7 @@
context 'missing short_id' do
it 'should respond with 422' do
post :create, params: params.slice(:description, :due_date, :course_id)
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not create an assignment' do
@@ -280,7 +280,7 @@
context 'missing description' do
it 'should respond with 422' do
post :create, params: params.slice(:short_identifier, :due_date, :course_id)
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not create an assignment' do
@@ -301,7 +301,7 @@
context 'where due_date is invalid' do
it 'should respond with 422' do
post :create, params: { **params, due_date: 'not a real date' }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
diff --git a/spec/controllers/api/groups_controller_spec.rb b/spec/controllers/api/groups_controller_spec.rb
index bd6cbd48ce..b17c6ee583 100644
--- a/spec/controllers/api/groups_controller_spec.rb
+++ b/spec/controllers/api/groups_controller_spec.rb
@@ -104,7 +104,7 @@
it 'raises an error - response status check' do
assignment.group_name_autogenerated = false
post_as instructor, :create, params: { course_id: course.id, assignment_id: assignment }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
@@ -133,7 +133,7 @@
it 'raises an error - response status check' do
post_as instructor, :create,
params: { course_id: course.id, assignment_id: assignment, new_group_name: group_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
@@ -260,7 +260,7 @@
it 'should reject invalid filters' do
get :index, params: { assignment_id: groupings.first.assignment.id, course_id: course.id,
filter: { bad_filter: 'something' } }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
@@ -388,7 +388,7 @@
it_behaves_like 'for a different course'
it 'should respond with 422' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not add the student to the group' do
@@ -955,14 +955,14 @@
patch :extension,
params: { assignment_id: assignment.id, course_id: course.id, id: group.id,
extension: extension_params }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
context 'DELETE' do
it 'should not work for a non existent extension' do
delete :extension, params: { assignment_id: assignment.id, course_id: course.id, id: group.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -975,7 +975,7 @@
}
post :extension,
params: { assignment_id: assignment.id, course_id: course.id, id: group.id, extension: extension_params }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should not allow time delta to be empty' do
@@ -987,7 +987,7 @@
}
post :extension,
params: { assignment_id: assignment.id, course_id: course.id, id: group.id, extension: extension_params }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
@@ -1055,7 +1055,254 @@
collect_current: true,
apply_late_penalty: true,
retain_existing_grading: true }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
+ end
+ end
+ end
+
+ context 'POST add_test_run' do
+ let(:grouping) { create(:grouping_with_inviter, assignment: assignment) }
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_group) { create(:test_group, assignment: assignment) }
+ let(:valid_test_results) do
+ {
+ test_results: {
+ status: 'pass',
+ error: nil,
+ test_groups: [
+ {
+ time: 100,
+ extra_info: {
+ name: 'Test Group 1',
+ criterion: 'Correctness',
+ test_group_id: test_group.id,
+ display_output: 2
+ },
+ tests: [
+ {
+ name: 'test_example',
+ status: 'pass',
+ marks_earned: 5,
+ marks_total: 5,
+ time: 50,
+ output: 'Test passed successfully'
+ }
+ ]
+ }
+ ]
+ }
+ }
+ end
+
+ before do
+ request.env['HTTP_ACCEPT'] = 'application/json'
+ end
+
+ context 'when unauthenticated' do
+ before do
+ request.env['HTTP_AUTHORIZATION'] = 'garbage http_header'
+ end
+
+ it 'should fail to authenticate' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id },
+ body: valid_test_results.to_json
+ expect(response).to have_http_status(:forbidden)
+ end
+ end
+
+ context 'when authenticated' do
+ context 'with invalid test results schema' do
+ it 'should return unprocessable entity with validation errors' do
+ invalid_test_results = {
+ status: 'pass',
+ error: nil,
+ test_groups: [
+ {
+ time: 100,
+ extra_info: {
+ name: 'Test Group 1',
+ criterion: 'Correctness',
+ test_group_id: test_group.id,
+ display_output: 2
+ },
+ tests: [
+ {
+ # Missing required fields: name, status, marks_earned, marks_total, output
+ time: 50
+ }
+ ]
+ }
+ ]
+ }
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: invalid_test_results }
+ expect(response).to have_http_status(:unprocessable_content)
+ expect(response.parsed_body).to have_key('errors')
+ end
+ end
+
+ context 'with non-existent grouping' do
+ it 'should return not found' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: 999_999,
+ test_results: valid_test_results[:test_results] }
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+
+ context 'with grouping that has no submission' do
+ let(:grouping_without_submission) { create(:grouping_with_inviter, assignment: assignment) }
+
+ it 'should return unprocessable entity' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id,
+ id: grouping_without_submission.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response).to have_http_status(:unprocessable_content)
+ expect(response.parsed_body['errors']).to eq('No submission exists for this grouping')
+ end
+ end
+
+ context 'with valid test results' do
+ before do
+ submission # Ensure submission exists
+ end
+
+ it 'should create a new test run' do
+ expect do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end.to change { TestRun.count }.by(1)
+ end
+
+ it 'should return created status' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response).to have_http_status(:created)
+ end
+
+ it 'should return success status and test_run_id' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response.parsed_body['status']).to eq('success')
+ expect(response.parsed_body['test_run_id']).to be_present
+ end
+
+ it 'should create test run with correct attributes' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ test_run = TestRun.last
+ expect(test_run.role).to eq(instructor)
+ expect(test_run.grouping).to eq(grouping)
+ expect(test_run.submission).to eq(submission)
+ expect(test_run.status).to eq('complete')
+ end
+
+ it 'should create test group results' do
+ expect do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end.to change { TestGroupResult.count }.by(1)
+ end
+
+ it 'should create test results' do
+ expect do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end.to change { TestResult.count }.by(1)
+ end
+
+ it 'should create test result with correct data' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ test_result = TestResult.last
+ expect(test_result.name).to eq('test_example')
+ expect(test_result.status).to eq('pass')
+ expect(test_result.marks_earned).to eq(5)
+ expect(test_result.marks_total).to eq(5)
+ end
+ end
+
+ context 'when transaction fails' do
+ before do
+ submission # Ensure submission exists
+ # Mock TestRun.create! to raise an error
+ allow(TestRun).to receive(:create!).and_raise(
+ ActiveRecord::RecordInvalid.new(TestRun.new)
+ )
+ end
+
+ it 'should not create test run' do
+ expect do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end.not_to(change { TestRun.count })
+ end
+
+ it 'should return unprocessable entity' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+
+ it 'should return validation errors' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response.parsed_body).to have_key('errors')
+ end
+ end
+
+ context 'when update_results! fails' do
+ before do
+ submission # Ensure submission exists
+ # Mock update_results! to raise an error
+ allow_any_instance_of(TestRun).to receive(:update_results!).and_raise(
+ StandardError.new('Processing error')
+ )
+ end
+
+ it 'should rollback test run creation due to transaction' do
+ expect do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end.not_to(change { TestRun.count })
+ end
+
+ it 'should return internal server error' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response).to have_http_status(:internal_server_error)
+ end
+
+ it 'should return generic error message' do
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ expect(response.parsed_body['errors']).to eq('Failed to process test results')
+ end
+ end
+
+ it_behaves_like 'for a different course' do
+ before do
+ submission # Ensure submission exists
+ post :add_test_run,
+ params: { course_id: course.id, assignment_id: assignment.id, id: grouping.group.id,
+ test_results: valid_test_results[:test_results] }
+ end
end
end
end
diff --git a/spec/controllers/api/roles_controller_spec.rb b/spec/controllers/api/roles_controller_spec.rb
index 6045688d35..815a097722 100644
--- a/spec/controllers/api/roles_controller_spec.rb
+++ b/spec/controllers/api/roles_controller_spec.rb
@@ -199,7 +199,7 @@
let(:user_name) { 'a!!' }
it 'should raise a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -207,7 +207,7 @@
let(:type) { 'Dragon' }
it 'should raise a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -215,7 +215,7 @@
let(:other_params) { { section_name: 'section.name' } }
it 'should raise a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -295,7 +295,7 @@
context 'with an invalid section name' do
it 'should raise a 422 error' do
put :update, params: { id: student.id, course_id: course.id, section_name: 'section.name' }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -450,7 +450,7 @@
it 'should raise a 422 error' do
student = create(:student, course: course)
post :create, params: { user_name: student.user_name, type: :student, course_id: course.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -593,7 +593,7 @@
it 'should raise a 422 error' do
student = create(:student, course: course)
post :create, params: { user_name: student.user_name, type: :student, course_id: course.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/api/sections_controller_spec.rb b/spec/controllers/api/sections_controller_spec.rb
index 4be6b30572..f27158c5ff 100644
--- a/spec/controllers/api/sections_controller_spec.rb
+++ b/spec/controllers/api/sections_controller_spec.rb
@@ -49,7 +49,7 @@
it 'should throw a 422 error and not create a section with when given an invalid param' do
post :create, params: { course_id: course.id, section: { name: '' } }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
expect(course.sections.find_by(name: '')).to be_nil
end
end
diff --git a/spec/controllers/api/starter_file_groups_controller_spec.rb b/spec/controllers/api/starter_file_groups_controller_spec.rb
index 887ffd6801..85f402ab72 100644
--- a/spec/controllers/api/starter_file_groups_controller_spec.rb
+++ b/spec/controllers/api/starter_file_groups_controller_spec.rb
@@ -348,7 +348,7 @@
end
it 'returns a 422 status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'does not create the file' do
@@ -411,7 +411,7 @@
end
it 'returns a 422 status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'does not create the folder' do
@@ -474,7 +474,7 @@
end
it 'returns a 422 status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'does not delete the file' do
@@ -540,7 +540,7 @@
end
it 'returns a 422 status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'does not delete the folder' do
diff --git a/spec/controllers/api/submission_files_controller_spec.rb b/spec/controllers/api/submission_files_controller_spec.rb
index b19fbea441..728ced7028 100644
--- a/spec/controllers/api/submission_files_controller_spec.rb
+++ b/spec/controllers/api/submission_files_controller_spec.rb
@@ -288,7 +288,7 @@
let(:file_name) { file_names.map { |f| File.basename f }.join }
it 'should return a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/api/tags_controller_spec.rb b/spec/controllers/api/tags_controller_spec.rb
index 4d69e4f85b..7013fbb371 100644
--- a/spec/controllers/api/tags_controller_spec.rb
+++ b/spec/controllers/api/tags_controller_spec.rb
@@ -96,13 +96,13 @@
it 'should throw a 422 error if the grouping id is not valid' do
post :create, params: { course_id: course.id, name: 'new_tag', assignment_id: assignment.id,
grouping_id: grouping.id + 1 }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'should throw a 422 error if the assignment id is not valid' do
post :create, params: { course_id: course.id, name: 'new_tag', assignment_id: assignment.id + 1,
grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/api/users_controller_spec.rb b/spec/controllers/api/users_controller_spec.rb
index d5a1a6a706..484e714574 100644
--- a/spec/controllers/api/users_controller_spec.rb
+++ b/spec/controllers/api/users_controller_spec.rb
@@ -212,7 +212,7 @@
let(:new_user) { build(:end_user, user_name: ' dragon ..') }
it 'should raise a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
@@ -220,7 +220,7 @@
let(:new_user) { build(:end_user, type: 'Dragon') }
it 'should raise a 422 error' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
diff --git a/spec/controllers/assignments_controller_spec.rb b/spec/controllers/assignments_controller_spec.rb
index d731c3434c..66c1d1e092 100644
--- a/spec/controllers/assignments_controller_spec.rb
+++ b/spec/controllers/assignments_controller_spec.rb
@@ -243,6 +243,80 @@
end
end
+ context 'download the most recent test results as ZIP' do
+ let(:user) { create(:instructor) }
+ let(:assignment) { create(:assignment_with_criteria_and_test_results) }
+
+ it 'responds with the appropriate status' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+ expect(response).to have_http_status :success
+ end
+
+ it 'responds with the appropriate header' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+ expect(response.header['Content-Type']).to eq('application/zip')
+ end
+
+ it 'sets disposition as attachment' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+ d = response.header['Content-Disposition'].split.first
+ expect(d).to eq 'attachment;'
+ end
+
+ it 'responds with the appropriate filename' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+ filename = response.header['Content-Disposition'].split[1].split('"').second
+ expect(filename).to eq("#{assignment.short_identifier}_test_results.zip")
+ end
+
+ it 'returns application/zip type' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+ expect(response.media_type).to eq 'application/zip'
+ end
+
+ it 'contains a JSON file with the correct filename' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+
+ Tempfile.open(['test_results', '.zip']) do |temp_file|
+ temp_file.binmode
+ temp_file.write(response.body)
+ temp_file.rewind
+
+ Zip::File.open(temp_file.path) do |zip_file|
+ expected_json_filename = "#{assignment.short_identifier}_test_results.json"
+ expect(zip_file.entries.map(&:name)).to include(expected_json_filename)
+ end
+ end
+ end
+
+ it 'contains valid JSON data inside the zip' do
+ get_as user, :download_test_results, params: { course_id: user.course.id, id: assignment.id }, format: 'zip'
+
+ Tempfile.open(['test_results', '.zip']) do |temp_file|
+ temp_file.binmode
+ temp_file.write(response.body)
+ temp_file.rewind
+
+ Zip::File.open(temp_file.path) do |zip_file|
+ json_filename = "#{assignment.short_identifier}_test_results.json"
+ json_content = zip_file.read(json_filename)
+ parsed_json = JSON.parse(json_content)
+
+ # Verify the JSON structure matches what we expect
+ parsed_json.each do |group_name, group|
+ group.each do |test_group_name, test_group|
+ test_group.each do |test_result|
+ expect(test_result.fetch('name')).to eq test_group_name
+ expect(test_result.fetch('group_name')).to eq group_name
+ expect(test_result.key?('status')).to be true
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+
describe '#index' do
let(:course) { role.course }
@@ -2351,4 +2425,417 @@
expect(response).to redirect_to(edit_course_assignment_path(course.id, assignment.id))
end
end
+
+ describe 'visibility settings' do
+ let(:course) { create(:course) }
+ let(:instructor) { create(:instructor, course: course) }
+ let(:assignment) { create(:assignment, course: course) }
+
+ describe '#create with scheduled visibility' do
+ it 'should create assignment with visible_on and visible_until' do
+ visible_on_time = 1.day.from_now
+ visible_until_time = 7.days.from_now
+
+ params = example_form_params.deep_dup
+ params[:assignment][:is_hidden] = Assessment::SCHEDULED_VISIBILITY
+ params[:assignment][:visible_on] = visible_on_time.to_s
+ params[:assignment][:visible_until] = visible_until_time.to_s
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ expect(assignment.is_hidden).to be false
+ expect(assignment.visible_on).to be_within(1.second).of(visible_on_time)
+ expect(assignment.visible_until).to be_within(1.second).of(visible_until_time)
+ end
+
+ it 'should convert is_hidden="scheduled" to is_hidden=false' do
+ params = example_form_params.deep_dup
+ params[:assignment][:is_hidden] = Assessment::SCHEDULED_VISIBILITY
+ params[:assignment][:visible_on] = 1.day.from_now.to_s
+ params[:assignment][:visible_until] = 7.days.from_now.to_s
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ expect(assignment.is_hidden).to be false
+ end
+ end
+
+ describe '#update with scheduled visibility' do
+ it 'should update assignment with visible_on and visible_until' do
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: Assessment::SCHEDULED_VISIBILITY,
+ visible_on: 2.days.from_now.to_s,
+ visible_until: 10.days.from_now.to_s,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 0
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ assignment.reload
+ expect(assignment.is_hidden).to be false
+ expect(assignment.visible_on).to be_within(2.seconds).of(2.days.from_now)
+ expect(assignment.visible_until).to be_within(2.seconds).of(10.days.from_now)
+ end
+
+ it 'should clear datetime values when switching from scheduled to visible' do
+ assignment.update!(is_hidden: false, visible_on: 1.day.from_now, visible_until: 7.days.from_now)
+
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: false,
+ visible_on: nil,
+ visible_until: nil,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 0
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ assignment.reload
+ expect(assignment.is_hidden).to be false
+ expect(assignment.visible_on).to be_nil
+ expect(assignment.visible_until).to be_nil
+ end
+ end
+
+ describe 'section-specific scheduled visibility' do
+ let(:section) { create(:section, course: course) }
+
+ it 'should create section properties with scheduled visibility' do
+ params = example_form_params.deep_dup
+ params[:assignment][:assignment_properties_attributes][:section_due_dates_type] = 1
+ params[:assignment][:assessment_section_properties_attributes] = {
+ '0' => {
+ section_id: section.id,
+ is_hidden: Assessment::SCHEDULED_VISIBILITY,
+ visible_on: 1.day.from_now.to_s,
+ visible_until: 5.days.from_now.to_s
+ }
+ }
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ section_props = assignment.assessment_section_properties.find_by(section: section)
+ expect(section_props.is_hidden).to be false
+ expect(section_props.visible_on).to be_within(2.seconds).of(1.day.from_now)
+ expect(section_props.visible_until).to be_within(2.seconds).of(5.days.from_now)
+ end
+
+ it 'should update section properties with scheduled visibility' do
+ section_props = create(:assessment_section_properties, assessment: assignment, section: section)
+
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: false,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 1
+ },
+ assessment_section_properties_attributes: {
+ '0' => {
+ id: section_props.id,
+ section_id: section.id,
+ is_hidden: Assessment::SCHEDULED_VISIBILITY,
+ visible_on: 3.days.from_now.to_s,
+ visible_until: 8.days.from_now.to_s
+ }
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ section_props.reload
+ expect(section_props.is_hidden).to be false
+ expect(section_props.visible_on).to be_within(2.seconds).of(3.days.from_now)
+ expect(section_props.visible_until).to be_within(2.seconds).of(8.days.from_now)
+ end
+ end
+
+ describe '#edit form loading with scheduled visibility' do
+ it 'loads assignment with visible_on and visible_until correctly' do
+ assignment.update!(is_hidden: false, visible_on: 1.day.from_now, visible_until: 7.days.from_now)
+
+ get_as instructor, :edit, params: { course_id: course.id, id: assignment.id }
+
+ expect(response).to have_http_status(:success)
+ expect(assigns(:assignment).visible_on).to be_present
+ expect(assigns(:assignment).visible_until).to be_present
+ expect(assigns(:assignment).is_hidden).to be false
+ end
+
+ it 'loads assignment with only visible_on set' do
+ assignment.update!(is_hidden: false, visible_on: 1.day.from_now, visible_until: nil)
+
+ get_as instructor, :edit, params: { course_id: course.id, id: assignment.id }
+
+ expect(response).to have_http_status(:success)
+ expect(assigns(:assignment).visible_on).to be_present
+ expect(assigns(:assignment).visible_until).to be_nil
+ end
+
+ it 'loads assignment with only visible_until set' do
+ assignment.update!(is_hidden: false, visible_on: nil, visible_until: 7.days.from_now)
+
+ get_as instructor, :edit, params: { course_id: course.id, id: assignment.id }
+
+ expect(response).to have_http_status(:success)
+ expect(assigns(:assignment).visible_on).to be_nil
+ expect(assigns(:assignment).visible_until).to be_present
+ end
+
+ it 'loads assignment with is_hidden=true and no datetime values' do
+ assignment.update!(is_hidden: true, visible_on: nil, visible_until: nil)
+
+ get_as instructor, :edit, params: { course_id: course.id, id: assignment.id }
+
+ expect(response).to have_http_status(:success)
+ expect(assigns(:assignment).is_hidden).to be true
+ expect(assigns(:assignment).visible_on).to be_nil
+ expect(assigns(:assignment).visible_until).to be_nil
+ end
+ end
+
+ describe 'edge cases' do
+ it 'handles creating assignment with only visible_on' do
+ params = example_form_params.deep_dup
+ params[:assignment][:is_hidden] = Assessment::SCHEDULED_VISIBILITY
+ params[:assignment][:visible_on] = 1.day.from_now.to_s
+ params[:assignment][:visible_until] = nil
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ expect(assignment.is_hidden).to be false
+ expect(assignment.visible_on).to be_present
+ expect(assignment.visible_until).to be_nil
+ end
+
+ it 'handles creating assignment with only visible_until' do
+ params = example_form_params.deep_dup
+ params[:assignment][:is_hidden] = Assessment::SCHEDULED_VISIBILITY
+ params[:assignment][:visible_on] = nil
+ params[:assignment][:visible_until] = 7.days.from_now.to_s
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ expect(assignment.is_hidden).to be false
+ expect(assignment.visible_on).to be_nil
+ expect(assignment.visible_until).to be_present
+ end
+
+ it 'handles switching from scheduled to hidden' do
+ assignment.update!(is_hidden: false, visible_on: 1.day.from_now, visible_until: 7.days.from_now)
+
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: true,
+ visible_on: nil,
+ visible_until: nil,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 0
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ assignment.reload
+ expect(assignment.is_hidden).to be true
+ expect(assignment.visible_on).to be_nil
+ expect(assignment.visible_until).to be_nil
+ end
+ end
+
+ describe 'section-specific edge cases' do
+ let(:section) { create(:section, course: course) }
+
+ it 'handles creating section with only visible_on' do
+ params = example_form_params.deep_dup
+ params[:assignment][:assignment_properties_attributes][:section_due_dates_type] = 1
+ params[:assignment][:assessment_section_properties_attributes] = {
+ '0' => {
+ section_id: section.id,
+ is_hidden: Assessment::SCHEDULED_VISIBILITY,
+ visible_on: 1.day.from_now.to_s,
+ visible_until: nil
+ }
+ }
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ section_props = assignment.assessment_section_properties.find_by(section: section)
+ expect(section_props.is_hidden).to be false
+ expect(section_props.visible_on).to be_present
+ expect(section_props.visible_until).to be_nil
+ end
+
+ it 'handles creating section with only visible_until' do
+ params = example_form_params.deep_dup
+ params[:assignment][:assignment_properties_attributes][:section_due_dates_type] = 1
+ params[:assignment][:assessment_section_properties_attributes] = {
+ '0' => {
+ section_id: section.id,
+ is_hidden: Assessment::SCHEDULED_VISIBILITY,
+ visible_on: nil,
+ visible_until: 5.days.from_now.to_s
+ }
+ }
+
+ post_as instructor, :create, params: params
+
+ assignment = Assignment.last
+ section_props = assignment.assessment_section_properties.find_by(section: section)
+ expect(section_props.is_hidden).to be false
+ expect(section_props.visible_on).to be_nil
+ expect(section_props.visible_until).to be_present
+ end
+
+ it 'handles switching section from scheduled to hidden' do
+ section_props = create(:assessment_section_properties,
+ assessment: assignment,
+ section: section,
+ is_hidden: false,
+ visible_on: 1.day.from_now,
+ visible_until: 7.days.from_now)
+
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: false,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 1
+ },
+ assessment_section_properties_attributes: {
+ '0' => {
+ id: section_props.id,
+ section_id: section.id,
+ is_hidden: true
+ }
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ section_props.reload
+ expect(section_props.is_hidden).to be true
+ expect(section_props.visible_on).to be_nil
+ expect(section_props.visible_until).to be_nil
+ end
+
+ it 'handles switching section from scheduled to visible' do
+ section_props = create(:assessment_section_properties,
+ assessment: assignment,
+ section: section,
+ is_hidden: false,
+ visible_on: 1.day.from_now,
+ visible_until: 7.days.from_now)
+
+ params = {
+ course_id: course.id,
+ id: assignment.id,
+ is_group_assignment: true,
+ assignment: {
+ is_hidden: false,
+ short_identifier: assignment.short_identifier,
+ description: assignment.description,
+ due_date: assignment.due_date.to_s,
+ assignment_properties_attributes: {
+ id: assignment.assignment_properties.id,
+ scanned_exam: false,
+ section_due_dates_type: 1
+ },
+ assessment_section_properties_attributes: {
+ '0' => {
+ id: section_props.id,
+ section_id: section.id,
+ is_hidden: false
+ }
+ },
+ submission_rule_attributes: {
+ id: assignment.submission_rule.id,
+ type: assignment.submission_rule.type
+ }
+ }
+ }
+
+ put_as instructor, :update, params: params
+
+ section_props.reload
+ expect(section_props.is_hidden).to be false
+ expect(section_props.visible_on).to be_nil
+ expect(section_props.visible_until).to be_nil
+ end
+ end
+ end
end
diff --git a/spec/controllers/automated_tests_controller_spec.rb b/spec/controllers/automated_tests_controller_spec.rb
index 4c154b4956..015509b103 100644
--- a/spec/controllers/automated_tests_controller_spec.rb
+++ b/spec/controllers/automated_tests_controller_spec.rb
@@ -449,7 +449,7 @@
end
it 'should return a not_modified http status' do
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
end
@@ -465,7 +465,7 @@
end
it 'should return a not_modified http status' do
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
end
end
diff --git a/spec/controllers/course_summaries_controller_spec.rb b/spec/controllers/course_summaries_controller_spec.rb
index c359944505..34e8c0b1bc 100644
--- a/spec/controllers/course_summaries_controller_spec.rb
+++ b/spec/controllers/course_summaries_controller_spec.rb
@@ -1,6 +1,7 @@
describe CourseSummariesController do
# TODO: add 'role is from a different course' shared tests to each route test below
include CourseSummariesHelper
+
context 'An instructor' do
let(:instructor) { create(:instructor) }
let(:course) { instructor.course }
diff --git a/spec/controllers/courses_controller_spec.rb b/spec/controllers/courses_controller_spec.rb
index d5840ebbc2..631132c25d 100644
--- a/spec/controllers/courses_controller_spec.rb
+++ b/spec/controllers/courses_controller_spec.rb
@@ -51,18 +51,18 @@
it 'fails the switch to the current instructor' do
post_as instructor, :switch_role, params: { id: course.id, effective_user_login: instructor.user_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'fails the switch to another instructor' do
post_as instructor, :switch_role, params: { id: course.id, effective_user_login: second_instructor.user_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'fails to switch to an admin' do
admin = create(:admin_role, course: course)
post_as instructor, :switch_role, params: { id: course.id, effective_user_login: admin.user_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
context 'when the current user is an admin' do
@@ -70,7 +70,7 @@
it 'fails the switch to the current admin' do
post_as admin_role, :switch_role, params: { id: course.id, effective_user_login: admin_role.user_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'switches to another instructor' do
@@ -81,7 +81,7 @@
it 'fails to switch to another admin' do
admin = create(:admin_role, course: course)
post_as admin_role, :switch_role, params: { id: course.id, effective_user_login: admin.user_name }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
diff --git a/spec/controllers/criteria_controller_spec.rb b/spec/controllers/criteria_controller_spec.rb
index 3968a8d5c1..d87df0d785 100644
--- a/spec/controllers/criteria_controller_spec.rb
+++ b/spec/controllers/criteria_controller_spec.rb
@@ -58,8 +58,43 @@
describe 'Using Checkbox Criterion' do
let(:criterion) { :checkbox_criterion }
+ let(:checkbox_criterion) do
+ create(:checkbox_criterion,
+ assignment: assignment)
+ end
it_behaves_like 'callbacks'
+
+ describe 'An authenticated and authorized instructor doing a PUT' do
+ describe '#update' do
+ context 'when updating with assignment files' do
+ let!(:assignment_file1) { create(:assignment_file, assignment: assignment) }
+ let!(:assignment_file2) { create(:assignment_file, assignment: assignment) }
+
+ before do
+ put_as instructor,
+ :update,
+ params: {
+ course_id: course.id,
+ id: checkbox_criterion.id,
+ checkbox_criterion: {
+ name: 'Updated Checkbox Criterion',
+ assignment_files: [assignment_file1.id, assignment_file2.id]
+ }
+ },
+ format: :js
+ end
+
+ it 'should associate assignment files with criterion' do
+ expect(checkbox_criterion.reload.assignment_files).to include(assignment_file1, assignment_file2)
+ end
+
+ it 'should respond with success' do
+ expect(subject).to respond_with(:success)
+ end
+ end
+ end
+ end
end
describe 'Using Flexible Criteria' do
@@ -196,6 +231,22 @@
it 'should respond with success' do
expect(subject).to respond_with(:success)
end
+
+ context 'when marking has started' do
+ before do
+ # Create a grouping, submission, and result with marks to simulate marking having started
+ grouping = create(:grouping, assignment: assignment)
+ submission = create(:submission, grouping: grouping, submission_version_used: true)
+ result = create(:result, submission: submission, marking_state: Result::MARKING_STATES[:complete])
+ criterion = create(:flexible_criterion, assignment: assignment, max_mark: 10)
+ create(:mark, result: result, criterion: criterion, mark: 5)
+ get_as instructor, :index, params: { course_id: course.id, assignment_id: assignment.id }
+ end
+
+ it 'should display marking started warning' do
+ expect(flash[:notice]).to have_message(I18n.t('assignments.due_date.marking_started_warning'))
+ end
+ end
end
describe '#new' do
@@ -320,7 +371,7 @@
end
it 'should respond with unprocessable entity' do
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
end
@@ -368,7 +419,9 @@
context 'with save error' do
before do
allow_any_instance_of(FlexibleCriterion).to receive(:save).and_return(false)
- allow_any_instance_of(FlexibleCriterion).to receive(:errors).and_return(ActiveModel::Errors.new(self))
+ error_object = instance_double(ActiveModel::Errors)
+ allow(error_object).to receive(:full_messages).and_return(['Test error message'])
+ allow_any_instance_of(FlexibleCriterion).to receive(:errors).and_return(error_object)
post_as instructor,
:create,
params: { course_id: course.id, assignment_id: assignment.id,
@@ -383,7 +436,11 @@
end
it 'should respond with unprocessable entity' do
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
+ end
+
+ it 'should display error messages' do
+ expect(flash[:error]).to have_message('Test error message ')
end
end
@@ -493,6 +550,56 @@
expect(response).to have_http_status(:bad_request)
end
end
+
+ context 'when updating with assignment files' do
+ let!(:assignment_file1) { create(:assignment_file, assignment: assignment) }
+ let!(:assignment_file2) { create(:assignment_file, assignment: assignment) }
+
+ before do
+ put_as instructor,
+ :update,
+ params: {
+ course_id: course.id,
+ id: flexible_criterion.id,
+ flexible_criterion: {
+ name: 'Updated Criterion',
+ assignment_files: [assignment_file1.id, assignment_file2.id]
+ }
+ },
+ format: :js
+ end
+
+ it 'should associate assignment files with criterion' do
+ expect(flexible_criterion.reload.assignment_files).to include(assignment_file1, assignment_file2)
+ end
+
+ it 'should respond with success' do
+ expect(subject).to respond_with(:success)
+ end
+ end
+
+ context 'when update fails with validation errors' do
+ before do
+ put_as instructor,
+ :update,
+ params: {
+ course_id: course.id,
+ id: flexible_criterion.id,
+ flexible_criterion: {
+ max_mark: -1 # Invalid max_mark to trigger validation error
+ }
+ },
+ format: :js
+ end
+
+ it 'should display error messages' do
+ expect(flash[:error]).not_to be_empty
+ end
+
+ it 'should respond with unprocessable entity' do
+ expect(subject).to respond_with(:unprocessable_content)
+ end
+ end
end
describe '#edit' do
@@ -544,6 +651,28 @@
expect { FlexibleCriterion.find(flexible_criterion.id) }.to raise_error(ActiveRecord::RecordNotFound)
end
+
+ context 'when assignment marks are released' do
+ let!(:released_assignment) { create(:assignment_with_criteria_and_released_results) }
+ let!(:criterion_with_released_marks) do
+ released_assignment.criteria.find_by(type: 'FlexibleCriterion')
+ end
+
+ before do
+ delete_as instructor,
+ :destroy,
+ params: { course_id: released_assignment.course_id, id: criterion_with_released_marks.id },
+ format: :js
+ end
+
+ it 'should flash error message' do
+ expect(flash[:error]).to have_message(I18n.t('criteria.errors.released_marks'))
+ end
+
+ it 'should not delete the criterion' do
+ expect(FlexibleCriterion.find(criterion_with_released_marks.id)).to be_present
+ end
+ end
end
end
@@ -744,7 +873,7 @@
end
it 'should respond with unprocessable entity' do
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
end
@@ -765,6 +894,33 @@
expect(subject).to render_template(:update)
end
end
+
+ context 'when updating with assignment files' do
+ let!(:assignment_file1) { create(:assignment_file, assignment: assignment) }
+ let!(:assignment_file2) { create(:assignment_file, assignment: assignment) }
+
+ before do
+ put_as instructor,
+ :update,
+ params: {
+ course_id: course.id,
+ id: rubric_criterion.id,
+ rubric_criterion: {
+ name: 'Updated Rubric Criterion',
+ assignment_files: [assignment_file1.id, assignment_file2.id]
+ }
+ },
+ format: :js
+ end
+
+ it 'should associate assignment files with criterion' do
+ expect(rubric_criterion.reload.assignment_files).to include(assignment_file1, assignment_file2)
+ end
+
+ it 'should respond with success' do
+ expect(subject).to respond_with(:success)
+ end
+ end
end
end
@@ -806,7 +962,7 @@
end
it 'should respond with unprocessable entity' do
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
end
@@ -1245,6 +1401,28 @@
end
describe '#upload' do
+ context 'when marks are released' do
+ let!(:released_assignment) { create(:assignment_with_criteria_and_released_results) }
+ let(:test_file) { fixture_file_upload('criteria/upload_yml_mixed.yaml', 'text/yaml') }
+
+ before do
+ post_as instructor, :upload,
+ params: {
+ course_id: released_assignment.course_id,
+ assignment_id: released_assignment.id,
+ upload_file: test_file
+ }
+ end
+
+ it 'should flash error message' do
+ expect(flash[:error]).to have_message(I18n.t('criteria.errors.released_marks'))
+ end
+
+ it 'should redirect to index' do
+ expect(response).to redirect_to(action: 'index', id: released_assignment.id)
+ end
+ end
+
it_behaves_like 'a controller supporting upload', formats: [:yml] do
let(:params) { { course_id: course.id, assignment_id: assignment.id } }
end
diff --git a/spec/controllers/exam_templates_controller_spec.rb b/spec/controllers/exam_templates_controller_spec.rb
index 0243cd92ea..756713f4b4 100644
--- a/spec/controllers/exam_templates_controller_spec.rb
+++ b/spec/controllers/exam_templates_controller_spec.rb
@@ -318,7 +318,7 @@
end
it 'responds with an error status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
@@ -332,7 +332,7 @@
end
it 'responds with an error status code' do
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index c439fa2d67..d16813da7e 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -956,6 +956,99 @@
format: :json }
expect(response).to have_http_status(:not_found)
end
+
+ context 'when assigning inactive students' do
+ let!(:inactive_student) do
+ create(:student,
+ hidden: true,
+ user: create(:end_user,
+ user_name: 'inactive_student',
+ first_name: 'Inactive',
+ last_name: 'Student',
+ id_number: '99999'))
+ end
+
+ before do
+ grouping2 = create(:grouping, assignment: assignment)
+ create(:version_used_submission, grouping: grouping2)
+ end
+
+ it 'assigns an inactive student to the grouping when s_id is provided' do
+ post_as instructor, :assign_student_and_next,
+ params: { course_id: course.id,
+ assignment_id: assignment.id,
+ assignment: assignment.id,
+ names: "#{inactive_student.first_name} #{inactive_student.last_name}",
+ s_id: inactive_student.id,
+ g_id: grouping1.id,
+ format: :json }
+ expect(grouping1.memberships.first.role).to eq inactive_student
+ end
+
+ it 'assigns an inactive student to the grouping by name only' do
+ post_as instructor, :assign_student_and_next,
+ params: { course_id: course.id,
+ assignment_id: assignment.id,
+ assignment: assignment.id,
+ names: "#{inactive_student.first_name} #{inactive_student.last_name}",
+ g_id: grouping1.id,
+ format: :json }
+ expect(grouping1.memberships.first.role).to eq inactive_student
+ end
+ end
+
+ context 'testing student selection logic when s_id and names may differ' do
+ let!(:student2) do
+ create(:student,
+ user: create(:end_user,
+ user_name: 'c9test2',
+ first_name: 'Different',
+ last_name: 'Person',
+ id_number: '67890'))
+ end
+
+ before do
+ grouping2 = create(:grouping, assignment: assignment)
+ create(:version_used_submission, grouping: grouping2)
+ end
+
+ it 'uses name lookup when no dropdown selection is made (student.nil?)' do
+ post_as instructor, :assign_student_and_next,
+ params: { course_id: course.id,
+ assignment_id: assignment.id,
+ assignment: assignment.id,
+ names: "#{student1.first_name} #{student1.last_name}",
+ g_id: grouping1.id,
+ format: :json }
+ expect(grouping1.memberships.first.role).to eq student1
+ end
+
+ it 'prioritizes manually edited name over dropdown selection when they differ' do
+ # Simulates: user selected student2 from dropdown, then manually edited the text to student1's name
+ post_as instructor, :assign_student_and_next,
+ params: { course_id: course.id,
+ assignment_id: assignment.id,
+ assignment: assignment.id,
+ names: "#{student1.first_name} #{student1.last_name}",
+ s_id: student2.id,
+ g_id: grouping1.id,
+ format: :json }
+ expect(grouping1.memberships.first.role).to eq student1
+ expect(grouping1.memberships.map(&:role)).not_to include(student2)
+ end
+
+ it 'uses dropdown selection when it matches typed name' do
+ post_as instructor, :assign_student_and_next,
+ params: { course_id: course.id,
+ assignment_id: assignment.id,
+ assignment: assignment.id,
+ names: "#{student2.first_name} #{student2.last_name}",
+ s_id: student2.id,
+ g_id: grouping1.id,
+ format: :json }
+ expect(grouping1.memberships.first.role).to eq student2
+ end
+ end
end
end
@@ -1052,14 +1145,14 @@
it 'fails to accept when there is no invitation' do
post_as @current_student, :accept_invitation,
params: { course_id: course.id, assignment_id: grouping.assessment_id, grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'fails to accept when the invitation has already been accepted' do
create(:accepted_student_membership, role: @current_student, grouping: grouping)
post_as @current_student, :accept_invitation,
params: { course_id: course.id, assignment_id: grouping.assessment_id, grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'fails to accept when another invitation has already been accepted' do
@@ -1068,7 +1161,7 @@
create(:accepted_student_membership, role: @current_student, grouping: grouping2)
post_as @current_student, :accept_invitation,
params: { course_id: course.id, assignment_id: grouping.assessment_id, grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'rejects other pending invitations' do
@@ -1104,13 +1197,13 @@
create(:accepted_student_membership, role: @current_student, grouping: grouping)
post_as @current_student, :decline_invitation,
params: { course_id: course.id, assignment_id: grouping.assessment_id, grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
it 'fails to reject when there is no invitation' do
post_as @current_student, :decline_invitation,
params: { course_id: course.id, assignment_id: grouping.assessment_id, grouping_id: grouping.id }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
diff --git a/spec/controllers/lti_deployments_controller_spec.rb b/spec/controllers/lti_deployments_controller_spec.rb
index a5d7ff9949..f8c76ac33e 100644
--- a/spec/controllers/lti_deployments_controller_spec.rb
+++ b/spec/controllers/lti_deployments_controller_spec.rb
@@ -11,7 +11,8 @@
describe '#choose_course' do
let!(:course) { create(:course) }
let(:instructor) { create(:instructor, course: course) }
- let!(:lti) { create(:lti_deployment) }
+ let(:test_rlid) { 'a-unique-resource-link-id-12345' }
+ let!(:lti) { create(:lti_deployment, resource_link_id: test_rlid) }
describe 'get' do
it 'is inaccessible unless logged in' do
@@ -48,6 +49,12 @@
expect(lti.course).to eq(course)
end
+ it 'retains the resource_link_id after updating the course' do
+ post_as instructor, :choose_course, params: { id: lti.id, course: course.id }
+ lti.reload
+ expect(lti.resource_link_id).to eq(test_rlid)
+ end
+
context 'when the user does not have permission to link' do
let(:course2) { create(:course) }
let(:instructor2) { create(:instructor, course: course2) }
@@ -63,7 +70,8 @@
end
describe '#create_course' do
- let!(:lti_deployment) { create(:lti_deployment, lms_course_name: 'csc108') }
+ let(:test_rlid) { 'another-unique-rlid-67890' }
+ let!(:lti_deployment) { create(:lti_deployment, lms_course_name: 'csc108', resource_link_id: test_rlid) }
let(:course_params) do
{ id: lti_deployment.id, display_name: 'Introduction to Computer Science', name: lti_deployment.lms_course_name }
end
@@ -85,6 +93,11 @@
it 'creates an instructor role for the user' do
expect(Role.find_by(user: instructor.user, course: Course.find_by(name: 'csc108'))).not_to be_nil
end
+
+ it 'retains the resource_link_id after course creation' do
+ lti_deployment.reload
+ expect(lti_deployment.resource_link_id).to eq(test_rlid)
+ end
end
context 'as an admin user' do
diff --git a/spec/controllers/main_controller_spec.rb b/spec/controllers/main_controller_spec.rb
index a9ecbd49a5..645893e427 100644
--- a/spec/controllers/main_controller_spec.rb
+++ b/spec/controllers/main_controller_spec.rb
@@ -1,5 +1,6 @@
describe MainController do
include SessionHandler
+
let(:student) { create(:student) }
let(:ta) { create(:ta) }
let(:instructor) { create(:instructor) }
diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb
index 5ede5aef7e..2c34369b38 100644
--- a/spec/controllers/submissions_controller_spec.rb
+++ b/spec/controllers/submissions_controller_spec.rb
@@ -194,7 +194,7 @@
post_as @student, :update_files,
params: { course_id: course.id, assignment_id: @assignment.id, new_folders: [dir], path: '/' }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
expect(Dir).not_to exist(File.join(@grouping.group.repo_path, @grouping.assignment.repository_folder,
dir))
end
@@ -204,7 +204,7 @@
params: { course_id: course.id, assignment_id: @assignment.id,
delete_files: ['../../../../../LICENSE'], path: '/' }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
expect(File).to exist(
File.expand_path(File.join(@grouping.group.repo_path, '../../../../../LICENSE'))
)
@@ -215,7 +215,7 @@
params: { course_id: course.id, assignment_id: @assignment.id,
delete_folders: ['../../../../../doc'], path: '/' }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
expect(Dir).to exist(
File.expand_path(File.join(@grouping.group.repo_path, '../../../../../doc'))
)
@@ -380,7 +380,7 @@
post_as @student, :update_files,
params: { course_id: course.id, assignment_id: @assignment.id, new_files: [file1, file2] }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
# Check to see if the file was added
@grouping.group.access_repo do |repo|
@@ -456,7 +456,7 @@
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
+ expect(response).to have_http_status :unprocessable_content
end
it 'does not commit the non required directory' do
@@ -470,7 +470,7 @@
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
+ expect(response).to have_http_status :unprocessable_content
end
it 'does not commit a non required subdirectory' do
@@ -532,14 +532,14 @@
post_as @student, :update_files,
params: { course_id: course.id, assignment_id: @assignment.id,
new_files: ['.git'] }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
it 'should not be allowed in a zip file' do
zip_file = fixture_file_upload('test_zip_git_file.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 :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
it 'should not create a .git file in the repo' do
@@ -561,14 +561,14 @@
post_as @student, :update_files,
params: { course_id: course.id, assignment_id: @assignment.id,
new_folders: ['.git'] }
- expect(response).to have_http_status :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
it 'should not be allowed in a zip file' do
zip_file = fixture_file_upload('test_zip_git_folder.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 :unprocessable_entity
+ expect(response).to have_http_status :unprocessable_content
end
it 'should not create a .git directory in the repo' do
@@ -2066,7 +2066,7 @@ def self.test_no_flash
max_content_size: SAMPLE_FILE_CONTENT.size - 1 }
end
- it { expect(response).to have_http_status(:payload_too_large) }
+ it { expect(response).to have_http_status(:content_too_large) }
it 'should have an empty response body' do
expect(response.body).to be_empty
diff --git a/spec/db/check_repo_permissions_spec.rb b/spec/db/check_repo_permissions_spec.rb
index 4a2cdbe54a..f9b3643fb2 100644
--- a/spec/db/check_repo_permissions_spec.rb
+++ b/spec/db/check_repo_permissions_spec.rb
@@ -186,6 +186,85 @@
end
end
+ context 'the assignment has datetime-based visibility' do
+ context 'when visible_on is in the future' do
+ before { grouping.assignment.update! visible_on: 1.hour.from_now, visible_until: 2.hours.from_now }
+
+ it 'should fail' do
+ expect(script_success?).to be_falsy
+ end
+ end
+
+ context 'when visible_until is in the past' do
+ before { grouping.assignment.update! visible_on: 2.hours.ago, visible_until: 1.hour.ago }
+
+ it 'should fail' do
+ expect(script_success?).to be_falsy
+ end
+ end
+
+ context 'when current time is within visibility window' do
+ before { grouping.assignment.update! visible_on: 1.hour.ago, visible_until: 1.hour.from_now }
+
+ it 'should succeed' do
+ expect(script_success?).to be_truthy
+ end
+ end
+
+ context 'when only visible_on is set and in the past' do
+ before { grouping.assignment.update! visible_on: 1.hour.ago, visible_until: nil }
+
+ it 'should succeed' do
+ expect(script_success?).to be_truthy
+ end
+ end
+
+ context 'when only visible_until is set and in the future' do
+ before { grouping.assignment.update! visible_on: nil, visible_until: 1.hour.from_now }
+
+ it 'should succeed' do
+ expect(script_success?).to be_truthy
+ end
+ end
+ end
+
+ context 'the assignment has section-specific datetime visibility' do
+ before { role.update! section_id: section.id }
+
+ context 'when section visible_on is in the future' do
+ before do
+ create(:assessment_section_properties, assessment: grouping.assignment, section: section,
+ visible_on: 1.hour.from_now, visible_until: 2.hours.from_now)
+ end
+
+ it 'should fail' do
+ expect(script_success?).to be_falsy
+ end
+ end
+
+ context 'when section visible_until is in the past' do
+ before do
+ create(:assessment_section_properties, assessment: grouping.assignment, section: section,
+ visible_on: 2.hours.ago, visible_until: 1.hour.ago)
+ end
+
+ it 'should fail' do
+ expect(script_success?).to be_falsy
+ end
+ end
+
+ context 'when current time is within section visibility window' do
+ before do
+ create(:assessment_section_properties, assessment: grouping.assignment, section: section,
+ visible_on: 1.hour.ago, visible_until: 1.hour.from_now)
+ end
+
+ it 'should succeed' do
+ expect(script_success?).to be_truthy
+ end
+ end
+ end
+
context 'the assessment is timed' do
let(:due_date) { 10.hours.from_now }
diff --git a/spec/factories/assignment_files.rb b/spec/factories/assignment_files.rb
index 2cb0f9de57..d53bfe0a86 100644
--- a/spec/factories/assignment_files.rb
+++ b/spec/factories/assignment_files.rb
@@ -3,6 +3,6 @@
FactoryBot.define do
factory :assignment_file do
association :assignment
- filename { Faker::Lorem.word }
+ sequence(:filename) { |n| "#{Faker::Lorem.word}_#{n}" }
end
end
diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb
index 9f65cc7bda..12b5b38507 100644
--- a/spec/factories/assignments.rb
+++ b/spec/factories/assignments.rb
@@ -42,6 +42,13 @@
end
end
+ factory :assignment_with_criteria_and_released_results, parent: :assignment_with_criteria_and_results do
+ after(:create) do |a|
+ # Release marks by setting released_to_students to true on all current results
+ a.current_results.update_all(released_to_students: true)
+ end
+ end
+
factory :assignment_with_criteria_and_test_results, parent: :assignment do
after(:create) do |a|
create_list(:flexible_criterion, 3, assignment: a)
diff --git a/spec/factories/extra_marks.rb b/spec/factories/extra_marks.rb
index b215af1788..0019bdcf87 100644
--- a/spec/factories/extra_marks.rb
+++ b/spec/factories/extra_marks.rb
@@ -1,14 +1,23 @@
FactoryBot.define do
- factory :extra_mark do
+ factory :extra_mark, class: 'ExtraMark' do
association :result
description { Faker::Lorem.sentence }
unit { 'percentage' }
extra_mark { -10.0 }
- end
- factory :extra_mark_points, class: 'ExtraMark' do
- association :result
- description { Faker::Lorem.sentence }
- unit { 'points' }
- extra_mark { 1 }
+
+ factory :extra_mark_percentage do
+ unit { 'percentage' }
+ extra_mark { -10.0 }
+ end
+
+ factory :extra_mark_points do
+ unit { 'points' }
+ extra_mark { 1 }
+ end
+
+ factory :extra_mark_percentage_of_mark do
+ unit { 'percentage_of_mark' }
+ extra_mark { 5.0 }
+ end
end
end
diff --git a/spec/helpers/automated_tests_helper_spec.rb b/spec/helpers/automated_tests_helper_spec.rb
index ccefc1d671..1eb40287a7 100644
--- a/spec/helpers/automated_tests_helper_spec.rb
+++ b/spec/helpers/automated_tests_helper_spec.rb
@@ -1,5 +1,6 @@
describe AutomatedTestsHelper do
include ApplicationHelper
+
describe '.update_test_groups_from_specs' do
subject { update_test_groups_from_specs assignment, specs }
diff --git a/spec/helpers/lti_helper_spec.rb b/spec/helpers/lti_helper_spec.rb
index 9069cb1370..247657e60b 100644
--- a/spec/helpers/lti_helper_spec.rb
+++ b/spec/helpers/lti_helper_spec.rb
@@ -39,7 +39,10 @@
roles:
[
LtiDeployment::LTI_ROLES[:learner]
- ] },
+ ],
+ message: [{
+ LtiDeployment::LTI_CLAIMS[:custom] => { 'student_number' => '999123456' }
+ }] },
{ status: 'Active', name: 'second user',
picture: 'http://example.com/picture.png',
given_name: 'student.first_name',
@@ -51,7 +54,10 @@
roles:
[
LtiDeployment::LTI_ROLES[:learner]
- ] },
+ ],
+ message: [{
+ LtiDeployment::LTI_CLAIMS[:custom] => { 'student_number' => '999654321' }
+ }] },
{ status: 'Active', name: 'third user',
picture: 'http://example.com/picture.png',
given_name: 'student.first_name',
@@ -160,6 +166,62 @@
end
end
end
+
+ context 'when handling student ID numbers' do
+ subject do
+ roster_sync lti_deployment, [LtiDeployment::LTI_ROLES[:ta], LtiDeployment::LTI_ROLES[:learner]],
+ can_create_users: true, can_create_roles: true
+ end
+
+ let(:placeholder_student_number) { '999111222' }
+ let(:memberships_with_placeholder) do
+ [
+ { status: 'Active',
+ name: student.user.display_name,
+ given_name: student.user.first_name,
+ family_name: student.user.last_name,
+ lis_person_sourcedid: student.user.user_name,
+ email: student.user.email,
+ user_id: 'lti_user_id',
+ roles: [LtiDeployment::LTI_ROLES[:learner]],
+ message: [{
+ LtiDeployment::LTI_CLAIMS[:custom] => { 'student_number' => placeholder_student_number }
+ }] },
+ memberships[1].merge(message: [{
+ LtiDeployment::LTI_CLAIMS[:custom] => { 'student_number' => '$Canvas.user.sisIntegrationId' }
+ }]),
+ memberships[2].dup.except(:message)
+ ]
+ end
+
+ before do
+ lti_students_placeholder = { id: '...', context: { id: '...', label: 'tst1', title: 'test course' },
+ members: memberships_with_placeholder }.to_json
+ allow_any_instance_of(LtiDeployment).to(
+ receive(:send_lti_request!).and_return(OpenStruct.new(body: lti_students_placeholder))
+ )
+ end
+
+ it 'correctly saves the student number for a valid user' do
+ student.destroy!
+ student.user.destroy!
+ subject
+ user = EndUser.find_by(user_name: student.user_name)
+ expect(user.id_number).to eq(placeholder_student_number)
+ end
+
+ it 'sets the id_number to NULL for the Canvas placeholder' do
+ subject
+ user = EndUser.find_by(user_name: 'second_username')
+ expect(user.id_number).to be_nil
+ end
+
+ it 'sets the id_number to NULL when the custom claim is missing' do
+ subject
+ user = EndUser.find_by(user_name: 'third_username')
+ expect(user.id_number).to be_nil
+ end
+ end
end
context 'when syncing learners and TAs' do
@@ -434,6 +496,49 @@
expect(get_assignment_marks(lti_deployment, assessment)).not_to be_empty
end
end
+
+ context 'when some students are inactive (hidden)' do
+ let(:student1) { create(:student, course: course) }
+ let(:student2) { create(:student, course: course) }
+ let(:assignment) { create(:assignment, course: course) }
+
+ let!(:grouping) do
+ create(:grouping, assignment: assignment).tap do |g|
+ create(:student_membership,
+ grouping: g,
+ role: student1,
+ membership_status: StudentMembership::STATUSES[:accepted])
+
+ create(:student_membership,
+ grouping: g,
+ role: student2,
+ membership_status: StudentMembership::STATUSES[:accepted])
+ end
+ end
+
+ before do
+ create(:result,
+ grouping: grouping,
+ released_to_students: true,
+ marking_state: Result::MARKING_STATES[:complete])
+
+ student2.update!(hidden: true)
+
+ [student1.user, student2.user].each do |usr|
+ create(:lti_user, user: usr, lti_client: lti_deployment.lti_client)
+ end
+ end
+
+ it 'does not include hidden students in the marks hash' do
+ marks = get_assignment_marks(lti_deployment, assignment)
+
+ id1 = student1.user.lti_users.first.lti_user_id
+ id2 = student2.user.lti_users.first.lti_user_id
+
+ expect(marks.keys).to include(id1)
+ expect(marks.keys).not_to include(id2)
+ end
+ end
end
describe '#get_grade_entry_form_marks' do
diff --git a/spec/jobs/autotest_reset_url_job_spec.rb b/spec/jobs/autotest_reset_url_job_spec.rb
index 389f7cd368..80a52959ae 100644
--- a/spec/jobs/autotest_reset_url_job_spec.rb
+++ b/spec/jobs/autotest_reset_url_job_spec.rb
@@ -1,5 +1,6 @@
describe AutotestResetUrlJob do
include AutomatedTestsHelper
+
let(:host_with_port) { 'http://localhost:3000' }
let(:url) { 'http://example.com' }
let(:course) { create(:course) }
diff --git a/spec/lib/tasks/users_spec.rb b/spec/lib/tasks/users_spec.rb
new file mode 100644
index 0000000000..510b81bad0
--- /dev/null
+++ b/spec/lib/tasks/users_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+require 'rake'
+
+RSpec.describe 'db:prune_orphaned_end_users', type: :task do
+ before do
+ Rake.application.rake_require('tasks/users')
+ Rake::Task.define_task(:environment)
+ task.reenable
+ end
+
+ let(:task) { Rake::Task['db:prune_orphaned_end_users'] }
+
+ def valid_end_user(user_name)
+ EndUser.create!(
+ user_name: user_name,
+ first_name: 'First',
+ last_name: 'Last',
+ display_name: 'First Last'
+ )
+ end
+
+ context 'when orphaned end users exist' do
+ it 'deletes all orphaned end users and prints output' do
+ user1 = valid_end_user('orphan1')
+ user2 = valid_end_user('orphan2')
+
+ relation = EndUser.where(id: [user1.id, user2.id])
+
+ allow(EndUser).to receive(:get_orphaned_users).and_return(relation)
+
+ expect do
+ expect do
+ task.invoke
+ end.to output(/Found 2 orphaned EndUser records/).to_stdout
+ end.to change { EndUser.count }.by(-2)
+ end
+ end
+
+ context 'when no orphaned end users exist' do
+ it 'prints the appropriate message and deletes nothing' do
+ allow(EndUser).to receive(:get_orphaned_users).and_return(EndUser.none)
+
+ expect do
+ task.invoke
+ end.to output(/No orphaned EndUser records found/).to_stdout
+
+ expect(EndUser.count).to eq(0)
+ end
+ end
+end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index d2dfc94021..567cba3eef 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -2,6 +2,7 @@
RSpec.describe NotificationMailer do
include ERB::Util
+
RSpec.shared_examples 'an email' do
it 'renders the disclaimer in the body of the email.' do
expect(mail.body.to_s).to include('This is an automated email. Please do not reply.')
diff --git a/spec/models/annotation_category_spec.rb b/spec/models/annotation_category_spec.rb
index f1662fe327..1c4143d59e 100644
--- a/spec/models/annotation_category_spec.rb
+++ b/spec/models/annotation_category_spec.rb
@@ -353,4 +353,77 @@
end
end
end
+
+ describe '.to_json' do
+ let(:assignment) { create(:assignment) }
+
+ context 'when there is a single category and single text' do
+ let!(:category) { create(:annotation_category, assignment: assignment, annotation_category_name: 'Test A') }
+ let!(:text) { create(:annotation_text, annotation_category: category, content: 'Test A text') }
+
+ it 'returns a JSON for the category with its text' do
+ category_json = AnnotationCategory.to_json([category]).first
+ expect(category_json[:id]).to eq(category.id)
+ expect(category_json[:annotation_category_name]).to eq('Test A')
+ expect(category_json[:texts].size).to eq(1)
+
+ text_json = category_json[:texts].first
+ expect(text_json[:id]).to eq(text.id)
+ expect(text_json[:content]).to eq('Test A text')
+ expect(text_json[:deduction]).to be_nil
+ end
+ end
+
+ context 'when there is a category with multiple texts' do
+ let!(:category) { create(:annotation_category, assignment: assignment, annotation_category_name: 'Test B') }
+
+ it 'returns a JSON including all the texts for the category' do
+ create(:annotation_text, annotation_category: category, content: 'Test B text 1')
+ create(:annotation_text, annotation_category: category, content: 'Test B text 2')
+
+ category_json = AnnotationCategory.to_json([category]).first
+ expect(category_json[:id]).to eq(category.id)
+ expect(category_json[:annotation_category_name]).to eq('Test B')
+ expect(category_json[:texts].size).to eq(2)
+
+ texts_json = category_json[:texts]
+ expect(texts_json.pluck(:content)).to match_array(['Test B text 1', 'Test B text 2'])
+ expect(texts_json.pluck(:deduction)).to all(be_nil)
+ end
+ end
+
+ context 'when there are multiple categories with text(s)' do
+ let!(:category1) do
+ create(:annotation_category, assignment: assignment, annotation_category_name: 'Category A')
+ end
+ let!(:category2) do
+ create(:annotation_category, assignment: assignment, annotation_category_name: 'Category B')
+ end
+
+ it 'returns JSON for all categories with their texts' do
+ text1 = create(:annotation_text, annotation_category: category1, content: 'Category A text 1')
+ text2 = create(:annotation_text, annotation_category: category1, content: 'Category A text 2')
+ text3 = create(:annotation_text, annotation_category: category2, content: 'Category B text 3')
+
+ categories_json = AnnotationCategory.to_json([category1, category2])
+ category_ids = categories_json.pluck(:id) # rubocop:disable Rails/PluckId
+
+ expect(category_ids).to match_array([category1.id, category2.id])
+
+ all_texts = categories_json.flat_map { |c| c[:texts] }
+ expect(all_texts).to include({ id: text1.id, content: 'Category A text 1', deduction: nil })
+ expect(all_texts).to include({ id: text2.id, content: 'Category A text 2', deduction: nil })
+ expect(all_texts).to include({ id: text3.id, content: 'Category B text 3', deduction: nil })
+ end
+ end
+
+ context 'when a category has no texts' do
+ let!(:category) { create(:annotation_category, assignment: assignment, annotation_category_name: 'Empty A') }
+
+ it 'returns an empty texts array' do
+ category_json = AnnotationCategory.to_json([category]).first
+ expect(category_json[:texts]).to eq([])
+ end
+ end
+ end
end
diff --git a/spec/models/assessment_spec.rb b/spec/models/assessment_spec.rb
index 8499782bc2..6290c59c1f 100644
--- a/spec/models/assessment_spec.rb
+++ b/spec/models/assessment_spec.rb
@@ -19,4 +19,41 @@
expected_error = I18n.t(error_key, attribute: 'Short identifier')
expect(assessment.errors[:short_identifier]).to include(expected_error)
end
+
+ describe 'datetime visibility validation' do
+ let(:course) { create(:course) }
+
+ it 'allows nil visible_on and visible_until' do
+ assessment = create(:assignment, course: course, visible_on: nil, visible_until: nil)
+ expect(assessment).to be_valid
+ end
+
+ it 'allows only visible_on to be set' do
+ assessment = create(:assignment, course: course, visible_on: 1.day.ago, visible_until: nil)
+ expect(assessment).to be_valid
+ end
+
+ it 'allows only visible_until to be set' do
+ assessment = create(:assignment, course: course, visible_on: nil, visible_until: 1.day.from_now)
+ expect(assessment).to be_valid
+ end
+
+ it 'allows visible_on before visible_until' do
+ assessment = create(:assignment, course: course, visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ expect(assessment).to be_valid
+ end
+
+ it 'rejects visible_on equal to visible_until' do
+ time = Time.current
+ assessment = build(:assignment, course: course, visible_on: time, visible_until: time)
+ expect(assessment).not_to be_valid
+ expect(assessment.errors[:visible_until]).to include('must be after visible_on')
+ end
+
+ it 'rejects visible_on after visible_until' do
+ assessment = build(:assignment, course: course, visible_on: 1.day.from_now, visible_until: 1.day.ago)
+ expect(assessment).not_to be_valid
+ expect(assessment.errors[:visible_until]).to include('must be after visible_on')
+ end
+ end
end
diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb
index e32c2c48a8..46faf605bb 100644
--- a/spec/models/course_spec.rb
+++ b/spec/models/course_spec.rb
@@ -238,7 +238,7 @@
let(:desired_attributes) do
['short_identifier', 'description', 1.day.from_now.at_beginning_of_minute, 'message',
1, 2, 1, true, true, 2.days.from_now.at_beginning_of_minute, 'remark_message',
- true, true, false, true, true, true, true, false, true, true]
+ true, true, false, true, true, true, true, false, nil, nil, true, true]
end
let(:assignment) do
csv = desired_attributes.to_csv
@@ -358,7 +358,7 @@
let(:desired_attributes) do
['short_identifier', 'description', 1.day.from_now.at_beginning_of_minute, 'message',
1, 2, 1, true, true, 2.days.from_now.at_beginning_of_minute, 'remark_message',
- true, true, false, true, true, true, true, false, true, true]
+ true, true, false, true, true, true, true, false, nil, nil, true, true]
end
let(:assignment) do
desired_attribute_value_hash = Assignment::DEFAULT_FIELDS.zip(desired_attributes).to_h
@@ -390,7 +390,7 @@
let!(:new_assignment_attr) do
['new', 'abc', 1.day.from_now.at_beginning_of_minute, 'message',
1, 2, 1, true, true, 2.days.from_now.at_beginning_of_minute, 'remark_message',
- true, true, false, true, true, true, true, false, true, false]
+ true, true, false, true, true, true, true, false, nil, nil, true, false]
end
let!(:returned) do
# create the old assignment
@@ -732,7 +732,8 @@ def create_assignment_csv_string(assignment)
assignment.student_form_groups, assignment.remark_due_date, assignment.remark_message,
assignment.assign_graders_to_criteria, assignment.enable_test, assignment.enable_student_tests,
assignment.allow_remarks, assignment.display_grader_names_to_students, assignment.display_median_to_students,
- assignment.group_name_autogenerated, assignment.is_hidden, assignment.vcs_submit, assignment.has_peer_review].to_csv
+ assignment.group_name_autogenerated, assignment.is_hidden, assignment.visible_on, assignment.visible_until,
+ assignment.vcs_submit, assignment.has_peer_review].to_csv
end
def create_assignment_symbol_to_value_map(assignment)
@@ -757,6 +758,8 @@ def create_assignment_symbol_to_value_map(assignment)
display_median_to_students: assignment.display_median_to_students,
group_name_autogenerated: assignment.group_name_autogenerated,
is_hidden: assignment.is_hidden,
+ visible_on: assignment.visible_on,
+ visible_until: assignment.visible_until,
vcs_submit: assignment.vcs_submit,
has_peer_review: assignment.has_peer_review }
end
diff --git a/spec/models/grouping_spec.rb b/spec/models/grouping_spec.rb
index 5619d50d39..c186548234 100644
--- a/spec/models/grouping_spec.rb
+++ b/spec/models/grouping_spec.rb
@@ -1274,6 +1274,11 @@ def expect_updated_criteria_coverage_count_eq(expected_count)
expect(data[0]['test_results'][0]['feedback_files']).to eq expected
end
+
+ it 'should include the error_type field for each test group result' do
+ error_type = data[0]['test_results'][0]['test_group_results.error_type']
+ expect(error_type).to eq(test_run.test_group_results.first.error_type)
+ end
else
it 'should not return data' do
expect(data).to be_empty
@@ -1641,25 +1646,25 @@ def expect_updated_criteria_coverage_count_eq(expected_count)
end
it 'should let one navigate right if there is a result directly to the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, false)
expect(new_grouping.group_id).to eq(groupings.last.group_id)
end
it 'should let one navigate left if there is a result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, true)
expect(new_grouping.group_id).to eq(groupings.first.group_id)
end
it 'should not one navigate right if there is no result directly to the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, false)
expect(new_grouping).to be_nil
end
it 'should not let one navigate left if there is no result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, true)
expect(new_grouping).to be_nil
end
@@ -1668,13 +1673,13 @@ def expect_updated_criteria_coverage_count_eq(expected_count)
let(:groupings_collected) { [false, true] }
it 'should let me navigate to the right if any result exists towards the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, false)
expect(new_grouping.group_id).to eq(groupings.last.group_id)
end
it 'should let one navigate left if there is a result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, true)
expect(new_grouping.group_id).to eq(groupings.first.group_id)
end
@@ -1695,25 +1700,25 @@ def expect_updated_criteria_coverage_count_eq(expected_count)
end
it 'should let one navigate right if there is a result directly to the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, false)
expect(new_grouping.group_id).to be(groupings.last.group_id)
end
it 'should let one navigate left if there is a result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, true)
expect(new_grouping.group_id).to be(groupings.first.group_id)
end
it 'should not one navigate right if there is no result directly to the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, false)
expect(new_grouping).to be_nil
end
it 'should not let one navigate left if there is no result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, true)
expect(new_grouping).to be_nil
end
@@ -1727,13 +1732,13 @@ def expect_updated_criteria_coverage_count_eq(expected_count)
end
it 'should let me navigate to the right if any result exists towards the right' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.first.get_next_grouping(role, false)
expect(new_grouping.group_id).to eq(groupings.last.group_id)
end
it 'should let one navigate left if there is a result directly to the left' do
- groupings = assignment.groupings.joins(:group).order('group_name')
+ groupings = assignment.groupings.joins(:group).order(:group_name)
new_grouping = groupings.last.get_next_grouping(role, true)
expect(new_grouping.group_id).to eq(groupings.first.group_id)
end
diff --git a/spec/models/level_spec.rb b/spec/models/level_spec.rb
index 390acfcaf1..039805df66 100644
--- a/spec/models/level_spec.rb
+++ b/spec/models/level_spec.rb
@@ -7,11 +7,4 @@
it { is_expected.to have_one(:course) }
it { is_expected.to validate_numericality_of(:mark).is_greater_than_or_equal_to(0) }
-
- describe 'uniqueness validations' do
- subject { create(:level, mark: 0.5) }
-
- it { is_expected.to validate_uniqueness_of(:mark).scoped_to(:criterion_id) }
- it { is_expected.to validate_uniqueness_of(:name).scoped_to(:criterion_id) }
- end
end
diff --git a/spec/models/mark_spec.rb b/spec/models/mark_spec.rb
index e45f0c488c..56981e756e 100644
--- a/spec/models/mark_spec.rb
+++ b/spec/models/mark_spec.rb
@@ -58,9 +58,9 @@
create(:rubric_mark, mark: 4)
end
- it 'equals to mark times weight' do
+ it 'equals to mark times max mark' do
related_rubric = rubric_mark.criterion
- expect(rubric_mark.mark).to eq(related_rubric.weight)
+ expect(rubric_mark.mark).to eq(related_rubric.max_mark)
end
end
diff --git a/spec/models/penalty_decay_period_submission_rule_spec.rb b/spec/models/penalty_decay_period_submission_rule_spec.rb
index c1c08be754..bf55e6bdfe 100644
--- a/spec/models/penalty_decay_period_submission_rule_spec.rb
+++ b/spec/models/penalty_decay_period_submission_rule_spec.rb
@@ -9,7 +9,8 @@
Timecop.freeze(due_date + submission_time_offset) do
apply_rule
rule_overtime_message = rule.overtime_message(grouping)
- expected_overtime_message = I18n.t 'penalty_decay_period_submission_rules.overtime_message',
+ penalty_suffix = rule.penalty_type || ExtraMark::PERCENTAGE
+ expected_overtime_message = I18n.t "penalty_decay_period_submission_rules.overtime_message_#{penalty_suffix}",
potential_penalty: potential_penalty
expect(rule_overtime_message).to eq expected_overtime_message
end
@@ -64,4 +65,60 @@
it_behaves_like 'valid overtime message', 2.0, 25.hours
end
+
+ context 'when penalty_type is percentage_of_mark' do
+ before { rule.update!(penalty_type: ExtraMark::PERCENTAGE_OF_MARK) }
+
+ context 'when the group submitted during the first penalty period' do
+ include_context 'submission_rule_during_first'
+
+ it 'creates a percentage_of_mark penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::PERCENTAGE_OF_MARK
+ expect(result.extra_marks.first.extra_mark).to eq(-1.0)
+ end
+
+ it_behaves_like 'valid overtime message', 1.0, 10.hours
+ end
+
+ context 'when the group submitted during the second penalty period' do
+ include_context 'submission_rule_during_second'
+
+ it 'creates a percentage_of_mark penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::PERCENTAGE_OF_MARK
+ expect(result.extra_marks.first.extra_mark).to eq(-2.0)
+ end
+
+ it_behaves_like 'valid overtime message', 2.0, 25.hours
+ end
+ end
+
+ context 'when penalty_type is points' do
+ before { rule.update!(penalty_type: ExtraMark::POINTS) }
+
+ context 'when the group submitted during the first penalty period' do
+ include_context 'submission_rule_during_first'
+
+ it 'creates a points penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::POINTS
+ expect(result.extra_marks.first.extra_mark).to eq(-1.0)
+ end
+
+ it_behaves_like 'valid overtime message', 1.0, 10.hours
+ end
+
+ context 'when the group submitted during the second penalty period' do
+ include_context 'submission_rule_during_second'
+
+ it 'creates a points penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::POINTS
+ expect(result.extra_marks.first.extra_mark).to eq(-2.0)
+ end
+
+ it_behaves_like 'valid overtime message', 2.0, 25.hours
+ end
+ end
end
diff --git a/spec/models/penalty_period_submission_rule_spec.rb b/spec/models/penalty_period_submission_rule_spec.rb
index da7292f887..d347cad2af 100644
--- a/spec/models/penalty_period_submission_rule_spec.rb
+++ b/spec/models/penalty_period_submission_rule_spec.rb
@@ -9,7 +9,8 @@
Timecop.freeze(due_date + submission_time_offset) do
apply_rule
rule_overtime_message = rule.overtime_message(grouping)
- expected_overtime_message = I18n.t 'penalty_decay_period_submission_rules.overtime_message',
+ penalty_suffix = rule.penalty_type || ExtraMark::PERCENTAGE
+ expected_overtime_message = I18n.t "penalty_period_submission_rules.overtime_message_#{penalty_suffix}",
potential_penalty: potential_penalty
expect(rule_overtime_message).to eq expected_overtime_message
end
@@ -64,4 +65,60 @@
it_behaves_like 'valid overtime message', 2.0, 25.hours
end
+
+ context 'when penalty_type is percentage_of_mark' do
+ before { rule.update!(penalty_type: ExtraMark::PERCENTAGE_OF_MARK) }
+
+ context 'when the group submitted during the first penalty period' do
+ include_context 'submission_rule_during_first'
+
+ it 'creates a percentage_of_mark penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::PERCENTAGE_OF_MARK
+ expect(result.extra_marks.first.extra_mark).to eq(-1.0)
+ end
+
+ it_behaves_like 'valid overtime message', 1.0, 10.hours
+ end
+
+ context 'when the group submitted during the second penalty period' do
+ include_context 'submission_rule_during_second'
+
+ it 'creates a percentage_of_mark penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::PERCENTAGE_OF_MARK
+ expect(result.extra_marks.first.extra_mark).to eq(-2.0)
+ end
+
+ it_behaves_like 'valid overtime message', 2.0, 25.hours
+ end
+ end
+
+ context 'when penalty_type is points' do
+ before { rule.update!(penalty_type: ExtraMark::POINTS) }
+
+ context 'when the group submitted during the first penalty period' do
+ include_context 'submission_rule_during_first'
+
+ it 'creates a points penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::POINTS
+ expect(result.extra_marks.first.extra_mark).to eq(-1.0)
+ end
+
+ it_behaves_like 'valid overtime message', 1.0, 10.hours
+ end
+
+ context 'when the group submitted during the second penalty period' do
+ include_context 'submission_rule_during_second'
+
+ it 'creates a points penalty' do
+ apply_rule
+ expect(result.extra_marks.first.unit).to eq ExtraMark::POINTS
+ expect(result.extra_marks.first.extra_mark).to eq(-2.0)
+ end
+
+ it_behaves_like 'valid overtime message', 2.0, 25.hours
+ end
+ end
end
diff --git a/spec/models/result_spec.rb b/spec/models/result_spec.rb
index fe5d70668e..de7f34a45f 100644
--- a/spec/models/result_spec.rb
+++ b/spec/models/result_spec.rb
@@ -172,6 +172,58 @@
expect(Result.get_total_extra_marks(ids)).to eq(expected)
end
end
+
+ context 'with percentage_of_mark extra marks' do
+ it 'should calculate extra marks based on percentage of earned score' do
+ ids = Result.ids
+ result = Result.find(ids.first)
+ subtotal = result.get_subtotal
+ extra_mark = 5.0
+
+ create(:extra_mark_percentage_of_mark, result: result, extra_mark: extra_mark)
+ expected = Hash.new { |h, k| h[k] = nil }
+ expected[ids.first] = (extra_mark * subtotal / 100).round(2)
+ expect(Result.get_total_extra_marks(ids)).to eq(expected)
+ end
+
+ it 'should handle zero subtotal when calculating percentage of score' do
+ ids = Result.ids
+ result = Result.find(ids.first)
+ result.marks.update_all(mark: 0)
+ extra_mark = 10.0
+
+ create(:extra_mark_percentage_of_mark, result: result, extra_mark: extra_mark)
+ expected = Hash.new { |h, k| h[k] = nil }
+ expected[ids.first] = 0.0
+ expect(Result.get_total_extra_marks(ids)).to eq(expected)
+ end
+
+ it 'should calculate extra marks based on percentage of earned score with negative deduction' do
+ ids = Result.ids
+ result = Result.find(ids.first)
+ subtotal = result.get_subtotal
+ extra_mark = -5.0
+
+ create(:extra_mark_percentage_of_mark, result: result, extra_mark: extra_mark)
+ expected = Hash.new { |h, k| h[k] = nil }
+ expected[ids.first] = (extra_mark * subtotal / 100).round(2)
+ expect(Result.get_total_extra_marks(ids)).to eq(expected)
+ end
+
+ it 'should round to 2 decimal places' do
+ ids = Result.ids
+ result = Result.find(ids.first)
+ subtotal = result.get_subtotal
+ extra_mark = 7.0
+
+ create(:extra_mark_percentage_of_mark, result: result, extra_mark: extra_mark)
+ actual = Result.get_total_extra_marks(ids)[ids.first]
+ expect(actual).to eq(actual.round(2))
+
+ expected = (extra_mark * subtotal / 100).round(2)
+ expect(actual).to eq(expected)
+ end
+ end
end
describe '#get_total_mark' do
diff --git a/spec/models/rubric_criterion_spec.rb b/spec/models/rubric_criterion_spec.rb
index ac58582630..dcce6de781 100644
--- a/spec/models/rubric_criterion_spec.rb
+++ b/spec/models/rubric_criterion_spec.rb
@@ -190,6 +190,22 @@
end
context 'has basic levels functionality' do
+ describe 'uniqueness validations' do
+ it 'raise error on duplicate mark' do
+ @criterion.levels.create(name: 'A', description: 'A', mark: 5)
+ expect do
+ @criterion.levels.create!(name: 'B', description: 'B', mark: 5)
+ end.to raise_error(ActiveRecord::RecordInvalid, /Mark has already been taken/)
+ end
+
+ it 'raise error on duplicate name' do
+ @criterion.levels.create(name: 'A', description: 'A', mark: 5)
+ expect do
+ @criterion.levels.create!(name: 'A', description: 'B', mark: 6)
+ end.to raise_error(ActiveRecord::RecordInvalid, /Name has already been taken/)
+ end
+ end
+
describe 'can add levels' do
it 'not raise error' do
expect(@criterion.levels.length).to eq(5)
@@ -199,6 +215,23 @@
end
end
+ describe 'can swap values in a single transaction' do
+ it 'not raise error' do
+ # Create records
+ a = @criterion.levels.create(name: 'testname', description: 'Description for level', mark: '5')
+ b = @criterion.levels.create(name: 'sillyname', description: 'Description for level 2', mark: '6')
+
+ @criterion.update!(
+ levels_attributes: [
+ { id: a.id, name: 'placeholder' },
+ { id: b.id, name: 'testname' }
+ ]
+ )
+ expect(@criterion.levels.find(a.id).name).to eq 'placeholder'
+ expect(@criterion.levels.find(b.id).name).to eq 'testname'
+ end
+ end
+
describe 'can delete levels' do
it 'not raise error' do
expect(@criterion.levels.length).to eq(5)
diff --git a/spec/models/starter_file_entry_spec.rb b/spec/models/starter_file_entry_spec.rb
index 73fd91c4a5..429dba0d35 100644
--- a/spec/models/starter_file_entry_spec.rb
+++ b/spec/models/starter_file_entry_spec.rb
@@ -49,7 +49,7 @@
it 'should add files to an open zip file' do
FileUtils.rm_f(zip_path)
- Zip::File.open(zip_path, Zip::File::CREATE) do |zip_file|
+ Zip::File.open(zip_path, create: true) do |zip_file|
starter_file_entry.add_files_to_zip_file(zip_file)
end
Zip::File.open(zip_path) do |zip_file|
diff --git a/spec/models/student_membership_spec.rb b/spec/models/student_membership_spec.rb
index 41ffef772e..72087cfdcc 100644
--- a/spec/models/student_membership_spec.rb
+++ b/spec/models/student_membership_spec.rb
@@ -143,8 +143,8 @@ def namer(bool)
expect(membership.inviter?).to be true
end
- update_hash = { create: true, destroy: true, inviter: false, accepted: false, pending: true, rejected: true }
- it_behaves_like 'vcs_submit=true', :inviter_student_membership, update_hash
+ it_behaves_like 'vcs_submit=true', :inviter_student_membership,
+ { create: true, destroy: true, inviter: false, accepted: false, pending: true, rejected: true }
it_behaves_like 'vcs_submit=false', :inviter_student_membership
end
@@ -155,8 +155,8 @@ def namer(bool)
expect(membership.inviter?).to be false
end
- update_hash = { create: true, destroy: true, inviter: false, accepted: false, pending: true, rejected: true }
- it_behaves_like 'vcs_submit=true', :accepted_student_membership, update_hash
+ it_behaves_like 'vcs_submit=true', :accepted_student_membership,
+ { create: true, destroy: true, inviter: false, accepted: false, pending: true, rejected: true }
it_behaves_like 'vcs_submit=false', :accepted_student_membership
end
@@ -167,8 +167,8 @@ def namer(bool)
expect(membership.inviter?).to be false
end
- update_hash = { create: false, destroy: false, inviter: true, accepted: true, pending: false, rejected: false }
- it_behaves_like 'vcs_submit=true', :student_membership, update_hash
+ it_behaves_like 'vcs_submit=true', :student_membership,
+ { create: false, destroy: false, inviter: true, accepted: true, pending: false, rejected: false }
it_behaves_like 'vcs_submit=false', :student_membership
end
@@ -179,8 +179,8 @@ def namer(bool)
expect(membership.inviter?).to be false
end
- update_hash = { create: false, destroy: false, inviter: true, accepted: true, pending: false, rejected: false }
- it_behaves_like 'vcs_submit=true', :rejected_student_membership, update_hash
+ it_behaves_like 'vcs_submit=true', :rejected_student_membership,
+ { create: false, destroy: false, inviter: true, accepted: true, pending: false, rejected: false }
it_behaves_like 'vcs_submit=false', :rejected_student_membership
end
end
diff --git a/spec/models/student_spec.rb b/spec/models/student_spec.rb
index 63851a3bba..0fee6e98ac 100644
--- a/spec/models/student_spec.rb
+++ b/spec/models/student_spec.rb
@@ -395,4 +395,119 @@
expect(build(:student, user: create(:autotest_user))).not_to be_valid
end
end
+
+ describe '#visible_assessments with datetime visibility' do
+ let(:course) { create(:course) }
+ let(:student) { create(:student, course: course) }
+ let(:section) { create(:section, course: course) }
+ let(:student_with_section) { create(:student, course: course, section: section) }
+
+ context 'with global visibility (no section)' do
+ it 'returns assessment when is_hidden=false and no datetime set' do
+ assignment = create(:assignment, course: course, is_hidden: false)
+ expect(student.visible_assessments).to include(assignment)
+ end
+
+ it 'hides assessment when is_hidden=true and no datetime set' do
+ assignment = create(:assignment, course: course, is_hidden: true)
+ expect(student.visible_assessments).not_to include(assignment)
+ end
+
+ it 'shows assessment when datetime range includes current time (overrides is_hidden=true)' do
+ assignment = create(:assignment, course: course, is_hidden: true,
+ visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ expect(student.visible_assessments).to include(assignment)
+ end
+
+ it 'hides assessment when visible_on is in the future' do
+ assignment = create(:assignment, course: course, is_hidden: false,
+ visible_on: 1.day.from_now, visible_until: 2.days.from_now)
+ expect(student.visible_assessments).not_to include(assignment)
+ end
+
+ it 'hides assessment when visible_until is in the past' do
+ assignment = create(:assignment, course: course, is_hidden: false,
+ visible_on: 2.days.ago, visible_until: 1.day.ago)
+ expect(student.visible_assessments).not_to include(assignment)
+ end
+
+ it 'shows assessment when only visible_on is set and in the past' do
+ assignment = create(:assignment, course: course, is_hidden: true,
+ visible_on: 1.day.ago, visible_until: nil)
+ expect(student.visible_assessments).to include(assignment)
+ end
+
+ it 'shows assessment when only visible_until is set and in the future' do
+ assignment = create(:assignment, course: course, is_hidden: true,
+ visible_on: nil, visible_until: 1.day.from_now)
+ expect(student.visible_assessments).to include(assignment)
+ end
+ end
+
+ context 'with section-specific visibility' do
+ it 'uses section-specific is_hidden when no datetime set' do
+ assignment = create(:assignment, course: course, is_hidden: true)
+ create(:assessment_section_properties, assessment: assignment, section: section, is_hidden: false)
+ expect(student_with_section.visible_assessments).to include(assignment)
+ end
+
+ it 'section is_hidden=true overrides global is_hidden=false' do
+ assignment = create(:assignment, course: course, is_hidden: false)
+ create(:assessment_section_properties, assessment: assignment, section: section, is_hidden: true)
+ expect(student_with_section.visible_assessments).not_to include(assignment)
+ end
+
+ it 'section datetime overrides global datetime' do
+ assignment = create(:assignment, course: course, is_hidden: false,
+ visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ # Section says it's not visible yet
+ create(:assessment_section_properties, assessment: assignment, section: section,
+ visible_on: 1.day.from_now, visible_until: 2.days.from_now)
+ expect(student_with_section.visible_assessments).not_to include(assignment)
+ end
+
+ it 'section datetime makes hidden assessment visible when range includes current time' do
+ assignment = create(:assignment, course: course, is_hidden: true)
+ # Section has datetime visibility
+ create(:assessment_section_properties, assessment: assignment, section: section,
+ visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ expect(student_with_section.visible_assessments).to include(assignment)
+ end
+
+ it 'hides assessment when section visible_on is in the future' do
+ assignment = create(:assignment, course: course, is_hidden: false)
+ create(:assessment_section_properties, assessment: assignment, section: section,
+ visible_on: 1.day.from_now, visible_until: 2.days.from_now)
+ expect(student_with_section.visible_assessments).not_to include(assignment)
+ end
+
+ it 'hides assessment when section visible_until is in the past' do
+ assignment = create(:assignment, course: course, is_hidden: false)
+ create(:assessment_section_properties, assessment: assignment, section: section,
+ visible_on: 2.days.ago, visible_until: 1.day.ago)
+ expect(student_with_section.visible_assessments).not_to include(assignment)
+ end
+ end
+
+ context 'with assessment_id parameter' do
+ it 'returns specific assessment if visible' do
+ assignment = create(:assignment, course: course, is_hidden: false)
+ result = student.visible_assessments(assessment_id: assignment.id)
+ expect(result).to include(assignment)
+ end
+
+ it 'returns empty if specific assessment is not visible' do
+ assignment = create(:assignment, course: course, is_hidden: true)
+ result = student.visible_assessments(assessment_id: assignment.id)
+ expect(result).not_to include(assignment)
+ end
+
+ it 'respects datetime visibility for specific assessment' do
+ assignment = create(:assignment, course: course, is_hidden: true,
+ visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ result = student.visible_assessments(assessment_id: assignment.id)
+ expect(result).to include(assignment)
+ end
+ end
+ end
end
diff --git a/spec/models/submission_rule_spec.rb b/spec/models/submission_rule_spec.rb
index d79a3f4b75..21bb08ba7c 100644
--- a/spec/models/submission_rule_spec.rb
+++ b/spec/models/submission_rule_spec.rb
@@ -1,26 +1,24 @@
-shared_examples 'due_date_calculations' do |assignment_past, section_past, section_enabled: true|
+shared_examples 'due_date_calculations' do |assignment_past, section_past_param, section_enabled: true|
assignment_due_date_str = 'assignment due date'
- section_due_date_str = 'section_due_date'
+ section_due_date_str = section_enabled ? 'section_due_date' : assignment_due_date_str
+ section_past = section_enabled ? section_past_param : assignment_past
let(:assignment_due_date) { assignment.due_date }
let(:section_due_date_due_date) { section_enabled ? section_due_date.due_date : assignment_due_date }
- unless section_enabled
- section_past = assignment_past
- section_due_date_str = assignment_due_date_str
- end
-
before { assignment.reload }
describe '#can_collect_all_now?' do
it "should return #{assignment_past && section_past}" do
- expect(assignment.submission_rule.can_collect_all_now?).to eq(assignment_past && section_past)
+ section_past_value = section_enabled ? section_past_param : assignment_past
+ expect(assignment.submission_rule.can_collect_all_now?).to eq(assignment_past && section_past_value)
end
end
describe '#can_collect_grouping_now?(grouping) with section' do
it "should return #{section_past}" do
- expect(assignment.submission_rule.can_collect_grouping_now?(grouping_with_section)).to eq(section_past)
+ section_past_value = section_enabled ? section_past_param : assignment_past
+ expect(assignment.submission_rule.can_collect_grouping_now?(grouping_with_section)).to eq(section_past_value)
end
end
diff --git a/spec/models/test_group_result_spec.rb b/spec/models/test_group_result_spec.rb
index 6c0d9d6f19..f8ad206db5 100644
--- a/spec/models/test_group_result_spec.rb
+++ b/spec/models/test_group_result_spec.rb
@@ -95,5 +95,21 @@
expect(@test_group_result).not_to be_valid
end
end
+
+ context 'test group result with timeout error' do
+ it 'has timeout status displayed in the test run table' do
+ @test_group_result.error_type = :timeout
+ expect(@test_group_result).to be_valid
+ expect(@test_group_result.save).to be true
+ expect(@test_group_result.error_type).to eq('timeout')
+ end
+
+ it 'has no status displayed in the test run table' do
+ @test_group_result.error_type = nil
+ expect(@test_group_result).to be_valid
+ expect(@test_group_result.save).to be true
+ expect(@test_group_result.error_type).to be_nil
+ end
+ end
end
end
diff --git a/spec/models/test_run_spec.rb b/spec/models/test_run_spec.rb
index d64bd090a4..a8556dc896 100644
--- a/spec/models/test_run_spec.rb
+++ b/spec/models/test_run_spec.rb
@@ -173,6 +173,151 @@
}] }.deep_stringify_keys
end
+ context 'extra marks' do
+ let(:base_results) { results.deep_dup } # keep original intact
+
+ shared_context 'extra marks setup' do
+ before do
+ submission.reload
+ submission.current_result.update!(released_to_students: false)
+ allow(grouping).to receive(:current_submission_used).and_return(submission)
+ end
+ end
+
+ context 'when the test run has a submission and a valid POINTS extra marks' do
+ include_context 'extra marks setup'
+
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_run) do
+ create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+ end
+
+ before do
+ base_results['test_groups'].first['extra_marks'] = [
+ {
+ 'mark' => 3,
+ 'unit' => 'points',
+ 'description' => 'this is a test comment'
+ }
+ ]
+ end
+
+ it 'creates an ExtraMark on the submission result' do
+ expect { test_run.update_results!(base_results) }.to change { ExtraMark.count }.by(1)
+ em = ExtraMark.last
+ expect(em.unit).to eq ExtraMark::POINTS
+ expect(em.extra_mark).to eq 3
+ expect(em.result_id).to eq submission.current_result.id
+ expect(em.description).to eq 'this is a test comment'
+ end
+
+ it 'does not add the points to the test_group_result.marks_earned' do
+ test_run.update_results!(base_results)
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ # baseline earned = 1 (from first test), extra marks are not added to marks_earned
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2 # unchanged
+ end
+ end
+
+ context 'when the test run has a submission and a non-POINTS unit (percentage)' do
+ include_context 'extra marks setup'
+
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_run) do
+ create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+ end
+
+ before do
+ base_results['test_groups'].first['extra_marks'] = [
+ { 'unit' => ExtraMark::PERCENTAGE, 'mark' => 10, 'description' => '10% bump' }
+ ]
+ end
+
+ it 'creates an ExtraMark but does not change marks_earned' do
+ expect { test_run.update_results!(base_results) }.to change { ExtraMark.count }.by(1)
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ # baseline earned remains 1 since non-POINTS units donβt add to marks_earned
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2
+ end
+ end
+
+ context 'when the unit is invalid' do
+ include_context 'extra marks setup'
+
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_run) do
+ create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+ end
+
+ before do
+ base_results['test_groups'].first['extra_marks'] = [
+ { 'unit' => 'bananas', 'mark' => 99, 'description' => 'nope' }
+ ]
+ end
+
+ it 'ignores the comment and does not create an ExtraMark nor change marks' do
+ expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2
+ end
+ end
+
+ context 'when extra_marks is an empty array' do
+ include_context 'extra marks setup'
+
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_run) do
+ create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+ end
+
+ before do
+ base_results['test_groups'].first['extra_marks'] = []
+ end
+
+ it 'does nothing' do
+ expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2
+ end
+ end
+
+ context 'when extra_marks is missing' do
+ let(:submission) { create(:version_used_submission, grouping: grouping) }
+ let(:test_run) do
+ create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+ end
+
+ it 'does nothing' do
+ expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2
+ end
+ end
+
+ context 'when there is no submission result (no submission on the test run)' do
+ let(:test_run) { create(:test_run, status: :in_progress, grouping: grouping, autotest_test_id: 1) }
+
+ before do
+ base_results['test_groups'].first['extra_marks'] = [
+ { 'unit' => ExtraMark::POINTS, 'mark' => 5, 'description' => 'should be ignored' }
+ ]
+ end
+
+ it 'does not create ExtraMark and does not change marks_earned' do
+ expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+ tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+ # no submission => add_extra_marks returns 0, so only earned = 1 baseline
+ expect(tgr.marks_earned).to eq 1
+ expect(tgr.marks_total).to eq 2
+ end
+ end
+ end
+
context 'when there are feedback files' do
let(:feedback_files) { test_group.test_group_results.first.feedback_files }
diff --git a/spec/policies/assignment_policy_spec.rb b/spec/policies/assignment_policy_spec.rb
index 32fc7171d8..f55fb09b37 100644
--- a/spec/policies/assignment_policy_spec.rb
+++ b/spec/policies/assignment_policy_spec.rb
@@ -423,5 +423,57 @@
before { assessment_section_properties.update(is_hidden: true) }
end
end
+
+ context 'with datetime visibility' do
+ let(:role) { create(:student) }
+
+ succeed 'when visible_on is in the past and visible_until is in the future' do
+ before { assignment.update(is_hidden: true, visible_on: 1.day.ago, visible_until: 1.day.from_now) }
+ end
+
+ failed 'when visible_on is in the future' do
+ before { assignment.update(is_hidden: false, visible_on: 1.day.from_now, visible_until: 2.days.from_now) }
+ end
+
+ failed 'when visible_until is in the past' do
+ before { assignment.update(is_hidden: false, visible_on: 2.days.ago, visible_until: 1.day.ago) }
+ end
+
+ succeed 'when only visible_on is set and in the past' do
+ before { assignment.update(is_hidden: true, visible_on: 1.day.ago, visible_until: nil) }
+ end
+
+ succeed 'when only visible_until is set and in the future' do
+ before { assignment.update(is_hidden: true, visible_on: nil, visible_until: 1.day.from_now) }
+ end
+
+ context 'with section-specific datetime' do
+ let(:role) { create(:student, section: new_section) }
+
+ succeed 'when section datetime is valid' do
+ before do
+ assignment.update(is_hidden: true)
+ create(:assessment_section_properties, assessment: assignment, section: new_section,
+ visible_on: 1.day.ago, visible_until: 1.day.from_now)
+ end
+ end
+
+ failed 'when section visible_on is in the future' do
+ before do
+ assignment.update(is_hidden: false)
+ create(:assessment_section_properties, assessment: assignment, section: new_section,
+ visible_on: 1.day.from_now, visible_until: 2.days.from_now)
+ end
+ end
+
+ failed 'when section visible_until is in the past' do
+ before do
+ assignment.update(is_hidden: false)
+ create(:assessment_section_properties, assessment: assignment, section: new_section,
+ visible_on: 2.days.ago, visible_until: 1.day.ago)
+ end
+ end
+ end
+ end
end
end
diff --git a/spec/routing/routes_spec.rb b/spec/routing/routes_spec.rb
index f9f655bcb4..4ac12671e8 100644
--- a/spec/routing/routes_spec.rb
+++ b/spec/routing/routes_spec.rb
@@ -1,7 +1,7 @@
describe 'routing' do
Rails.application.routes.routes.map do |r|
spec = r.path.spec.to_s
- next if spec.match %r{^/rails|^/assets|^/cable|.*\*path\(.:format\)}.freeze
+ next if %r{^/rails|^/assets|^/cable|.*\*path\(.:format\)}.match?(spec)
r.verb.split('|').each do |verb|
it "#{verb}: #{r.path.spec}" do
parts = r.required_parts.index_with { |_part| '1' }
diff --git a/spec/support/course_association_shared_examples.rb b/spec/support/course_association_shared_examples.rb
index 8d36edffb4..5a24dd5973 100644
--- a/spec/support/course_association_shared_examples.rb
+++ b/spec/support/course_association_shared_examples.rb
@@ -1,5 +1,6 @@
shared_examples 'course associations' do
include CourseAssociationHelper
+
it 'should be valid when all belongs_to associations belong to the same course' do
expect(subject).to be_valid
end
diff --git a/spec/support/lti_controller_examples.rb b/spec/support/lti_controller_examples.rb
index f98a709d1d..7c06c869fc 100644
--- a/spec/support/lti_controller_examples.rb
+++ b/spec/support/lti_controller_examples.rb
@@ -19,6 +19,29 @@
root_uri.query = launch_params.to_query
root_uri.to_s
end
+ let(:mock_roles) { [LtiDeployment::LTI_ROLES[:instructor]] }
+
+ def create_pub_jwk
+ @create_pub_jwk ||= JWT::JWK.new(OpenSSL::PKey::RSA.new(1024))
+ end
+
+ def generate_payload(roles, nonce)
+ { aud: client_id,
+ iss: host,
+ nonce: nonce,
+ LtiDeployment::LTI_CLAIMS[:deployment_id] => 'some_deployment_id',
+ LtiDeployment::LTI_CLAIMS[:context] => { label: 'csc108', title: 'test' },
+ LtiDeployment::LTI_CLAIMS[:custom] => { course_id: 1, user_id: 1 },
+ LtiDeployment::LTI_CLAIMS[:user_id] => 'some_user_id',
+ LtiDeployment::LTI_CLAIMS[:roles] => roles }
+ end
+
+ def generate_lti_jwt(roles, nonce)
+ payload = generate_payload(roles, nonce)
+ pub_jwk = create_pub_jwk
+ JWT.encode(payload, pub_jwk.keypair, 'RS256', { kid: pub_jwk.kid })
+ end
+
describe '#launch' do
context 'when launching with invalid parameters' do
let(:lti_message_hint) { 'opaque string' }
@@ -27,33 +50,33 @@
it 'responds with unprocessable_entity if no parameters are passed' do
request.headers['Referer'] = host
post :launch, params: {}
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
it 'responds with unprocessable_entity if lti_message_hint is not passed' do
request.headers['Referer'] = host
post :launch, params: { client_id: client_id, target_link_uri: target_link_uri, login_hint: login_hint }
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
it 'responds with unprocessable_entity if client_id is not passed' do
request.headers['Referer'] = host
post :launch,
params: { lti_message_hint: lti_message_hint, target_link_uri: target_link_uri, login_hint: login_hint }
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
it 'responds with unprocessable_entity if target_link_uri is not passed' do
request.headers['Referer'] = host
post :launch, params: { lti_message_hint: lti_message_hint, client_id: client_id, login_hint: login_hint }
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
it 'responds with unprocessable_entity if login_hint is not passed' do
request.headers['Referer'] = host
post :launch,
params: { lti_message_hint: lti_message_hint, client_id: client_id, target_link_uri: target_link_uri }
- expect(subject).to respond_with(:unprocessable_entity)
+ expect(subject).to respond_with(:unprocessable_content)
end
context 'when all required params exist' do
@@ -98,6 +121,8 @@
let(:nonce) { rand(10 ** 30).to_s.rjust(30, '0') }
before do
+ stub_request(:get, jwk_url).to_return(status: 200, body: { keys: [create_pub_jwk.export] }.to_json)
+
lti_launch_data = {}
lti_launch_data[:client_id] = client_id
lti_launch_data[:iss] = host
@@ -129,27 +154,10 @@
end
context 'with correct parameters' do
- let(:payload) do
- { aud: client_id,
- iss: host,
- nonce: nonce,
- LtiDeployment::LTI_CLAIMS[:deployment_id] => 'some_deployment_id',
- LtiDeployment::LTI_CLAIMS[:context] => {
- label: 'csc108',
- title: 'test'
- },
- LtiDeployment::LTI_CLAIMS[:custom] => {
- course_id: 1,
- user_id: 1
- },
- LtiDeployment::LTI_CLAIMS[:user_id] => 'some_user_id' }
- end
- let(:pub_jwk) { JWT::JWK.new(OpenSSL::PKey::RSA.new(1024)) }
- let(:lti_jwt) { JWT.encode(payload, pub_jwk.keypair, 'RS256', { kid: pub_jwk.kid }) }
+ let(:lti_jwt) { generate_lti_jwt(mock_roles, nonce) }
before do
session[:client_id] = client_id
- stub_request(:get, jwk_url).to_return(status: 200, body: { keys: [pub_jwk.export] }.to_json)
end
it 'successfully decodes the jwt and redirects' do
@@ -190,6 +198,53 @@
end
end
+ context 'with LTI role authorization' do
+ let(:admin_lti_uri) { LtiDeployment::LTI_ROLES[:admin] }
+ let(:student_lti_uri) { LtiDeployment::LTI_ROLES[:learner] }
+ let(:ta_lti_uri) { LtiDeployment::LTI_ROLES[:ta] }
+ let(:instructor_lti_uri) { LtiDeployment::LTI_ROLES[:instructor] }
+
+ context 'when LTI role is Instructor' do
+ let(:lti_jwt) { generate_lti_jwt([instructor_lti_uri], nonce) }
+
+ it 'redirects to course chooser' do
+ request.headers['Referer'] = host
+ post_as instructor, :redirect_login, params: { state: session.id.to_s, id_token: lti_jwt }
+ expect(response).to redirect_to(choose_course_lti_deployment_path(LtiDeployment.first))
+ end
+ end
+
+ context 'when LTI role is Admin' do
+ let(:lti_jwt) { generate_lti_jwt([admin_lti_uri], nonce) }
+
+ it 'redirects to course chooser' do
+ request.headers['Referer'] = host
+ post_as instructor, :redirect_login, params: { state: session.id.to_s, id_token: lti_jwt }
+ expect(response).to redirect_to(choose_course_lti_deployment_path(LtiDeployment.first))
+ end
+ end
+
+ context 'when LTI role is Student' do
+ let(:lti_jwt) { generate_lti_jwt([student_lti_uri], nonce) }
+
+ it 'redirects to "not set up" page' do
+ request.headers['Referer'] = host
+ post_as instructor, :redirect_login, params: { state: session.id.to_s, id_token: lti_jwt }
+ expect(response).to redirect_to(course_not_set_up_lti_deployment_path(LtiDeployment.first))
+ end
+ end
+
+ context 'when LTI role is TA (even with Instructor claim)' do
+ let(:lti_jwt) { generate_lti_jwt([ta_lti_uri, instructor_lti_uri], nonce) }
+
+ it 'redirects to "not set up" page' do
+ request.headers['Referer'] = host
+ post_as instructor, :redirect_login, params: { state: session.id.to_s, id_token: lti_jwt }
+ expect(response).to redirect_to(course_not_set_up_lti_deployment_path(LtiDeployment.first))
+ end
+ end
+ end
+
context 'get' do
it 'returns an error if not logged in' do
request.headers['Referer'] = host
@@ -212,7 +267,8 @@
lms_course_name: 'Introduction to Computer Science',
lms_course_label: 'CSC108',
lms_course_id: 1,
- lti_user_id: 'user_id' }
+ lti_user_id: 'user_id',
+ user_roles: mock_roles }
end
let(:payload) do
{ aud: client_id,
@@ -225,14 +281,12 @@
LtiDeployment::LTI_CLAIMS[:custom] => {
course_id: 1,
user_id: 1
- } }
+ },
+ LtiDeployment::LTI_CLAIMS[:roles] => mock_roles }
end
- let(:pub_jwk) { JWT::JWK.new(OpenSSL::PKey::RSA.new(1024)) }
- let(:lti_jwt) { JWT.encode(payload, pub_jwk.keypair, 'RS256', { kid: pub_jwk.kid }) }
before do
cookies.permanent.encrypted[:lti_data] = { value: JSON.generate(lti_data), expires: 5.minutes.from_now }
- stub_request(:get, jwk_url).to_return(status: 200, body: { keys: [pub_jwk.export] }.to_json)
end
it 'successfully decodes the jwt and redirects' do
@@ -294,7 +348,7 @@
post_as instructor, :launch, params: { lti_message_hint: 'hint',
login_hint: 'hint',
client_id: 'LMS defined ID', target_link_uri: 'test.com' }
- expect(response).to have_http_status(:unprocessable_entity)
+ expect(response).to have_http_status(:unprocessable_content)
end
end
end
|