diff --git a/app/jsx/bundles/assignment_moderation.js b/app/jsx/bundles/assignment_moderation.js
index 46435176307..c4c1cd62718 100644
--- a/app/jsx/bundles/assignment_moderation.js
+++ b/app/jsx/bundles/assignment_moderation.js
@@ -38,7 +38,6 @@ const store = configureStore({
unmute: false
},
assignment: {
- anonymousModeratedMarkingEnabled: window.ENV.ANONYMOUS_MODERATED_MARKING_ENABLED,
muted: window.ENV.ASSIGNMENT_MUTED,
published: window.ENV.GRADES_PUBLISHED,
title: window.ENV.ASSIGNMENT_TITLE,
diff --git a/app/jsx/gradebook/SubmissionStateMap.js b/app/jsx/gradebook/SubmissionStateMap.js
index 68b01944019..c4f8bc6d34d 100644
--- a/app/jsx/gradebook/SubmissionStateMap.js
+++ b/app/jsx/gradebook/SubmissionStateMap.js
@@ -36,10 +36,9 @@ import GradingPeriodsHelper from '../grading/helpers/GradingPeriodsHelper'
student,
hasGradingPeriods,
selectedGradingPeriodID,
- isAdmin,
- anonymousModeratedMarkingEnabled
+ isAdmin
) {
- if (assignment.anonymous_grading && assignment.muted && anonymousModeratedMarkingEnabled) {
+ if (assignment.anonymous_grading && assignment.muted) {
return { locked: true, hideGrade: true };
} else if (!visibleToStudent(assignment, student)) {
return { locked: true, hideGrade: true, tooltip: TOOLTIP_KEYS.NONE };
@@ -74,11 +73,10 @@ import GradingPeriodsHelper from '../grading/helpers/GradingPeriodsHelper'
}
class SubmissionState {
- constructor({ hasGradingPeriods, selectedGradingPeriodID, isAdmin, anonymousModeratedMarkingEnabled }) {
+ constructor({ hasGradingPeriods, selectedGradingPeriodID, isAdmin }) {
this.hasGradingPeriods = hasGradingPeriods;
this.selectedGradingPeriodID = selectedGradingPeriodID;
this.isAdmin = isAdmin;
- this.anonymousModeratedMarkingEnabled = anonymousModeratedMarkingEnabled;
this.submissionCellMap = {};
this.submissionMap = {};
}
@@ -100,8 +98,7 @@ import GradingPeriodsHelper from '../grading/helpers/GradingPeriodsHelper'
student,
this.hasGradingPeriods,
this.selectedGradingPeriodID,
- this.isAdmin,
- this.anonymousModeratedMarkingEnabled
+ this.isAdmin
];
this.submissionCellMap[student.id][assignment.id] = cellMapForSubmission(...params);
diff --git a/app/jsx/gradezilla/SubmissionStateMap.js b/app/jsx/gradezilla/SubmissionStateMap.js
index 9ed26e7e7a2..d0ce39f0be6 100644
--- a/app/jsx/gradezilla/SubmissionStateMap.js
+++ b/app/jsx/gradezilla/SubmissionStateMap.js
@@ -65,12 +65,12 @@ function cellMappingsForMultipleGradingPeriods (assignment, student, selectedGra
return { ...cellMapping, ...gradingPeriodInfo };
}
-function cellMapForSubmission (assignment, student, hasGradingPeriods, selectedGradingPeriodID, isAdmin, anonymousModeratedMarkingEnabled) {
+function cellMapForSubmission (assignment, student, hasGradingPeriods, selectedGradingPeriodID, isAdmin) {
if (!assignment.published) {
return { locked: true, hideGrade: true };
- } else if (assignment.moderated_grading && !assignment.grades_published && anonymousModeratedMarkingEnabled) {
+ } else if (assignment.moderated_grading && !assignment.grades_published) {
return { locked: true, hideGrade: false };
- } else if (assignment.anonymous_grading && assignment.muted && anonymousModeratedMarkingEnabled) {
+ } else if (assignment.anonymous_grading && assignment.muted) {
return { locked: true, hideGrade: true };
} else if (!visibleToStudent(assignment, student)) {
return { locked: true, hideGrade: true };
@@ -98,11 +98,10 @@ function missingSubmission (student, assignment) {
}
class SubmissionStateMap {
- constructor ({ hasGradingPeriods, selectedGradingPeriodID, isAdmin, anonymousModeratedMarkingEnabled }) {
+ constructor ({ hasGradingPeriods, selectedGradingPeriodID, isAdmin }) {
this.hasGradingPeriods = hasGradingPeriods;
this.selectedGradingPeriodID = selectedGradingPeriodID;
this.isAdmin = isAdmin;
- this.anonymousModeratedMarkingEnabled = anonymousModeratedMarkingEnabled;
this.submissionCellMap = {};
this.submissionMap = {};
}
@@ -124,8 +123,7 @@ class SubmissionStateMap {
student,
this.hasGradingPeriods,
this.selectedGradingPeriodID,
- this.isAdmin,
- this.anonymousModeratedMarkingEnabled
+ this.isAdmin
];
this.submissionCellMap[student.id][assignment.id] = cellMapForSubmission(...params);
diff --git a/app/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRenderer.js b/app/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRenderer.js
index b6d7cd55506..1773af1c851 100644
--- a/app/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRenderer.js
+++ b/app/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRenderer.js
@@ -62,7 +62,7 @@ function getProps (column, gradebook, options) {
addGradebookElement: gradebook.keyboardNav.addGradebookElement,
assignment: {
- anonymousGrading: assignment.anonymous_grading && gradebook.options.anonymous_moderated_marking_enabled,
+ anonymousGrading: assignment.anonymous_grading,
courseId: assignment.course_id,
htmlUrl: assignment.html_url,
id: assignment.id,
diff --git a/app/jsx/gradezilla/default_gradebook/components/SubmissionTray.js b/app/jsx/gradezilla/default_gradebook/components/SubmissionTray.js
index ea194838e51..7d1d13c41ee 100644
--- a/app/jsx/gradezilla/default_gradebook/components/SubmissionTray.js
+++ b/app/jsx/gradezilla/default_gradebook/components/SubmissionTray.js
@@ -65,7 +65,6 @@ export default class SubmissionTray extends React.Component {
};
static propTypes = {
- anonymousModeratedMarkingEnabled: bool.isRequired,
assignment: shape({
name: string.isRequired,
htmlUrl: string.isRequired,
@@ -199,7 +198,7 @@ export default class SubmissionTray extends React.Component {
renderSpeedGraderLink (speedGraderProps) {
const buttonProps = { variant: 'link', href: speedGraderProps.speedGraderUrl }
- if (this.props.anonymousModeratedMarkingEnabled && speedGraderProps.anonymousGrading) {
+ if (speedGraderProps.anonymousGrading) {
buttonProps.onClick = (e) => {
e.preventDefault();
this.props.onAnonymousSpeedGraderClick(speedGraderProps.speedGraderUrl);
@@ -219,7 +218,7 @@ export default class SubmissionTray extends React.Component {
const { name, avatarUrl } = this.props.student;
const assignmentParam = `assignment_id=${this.props.submission.assignmentId}`;
const studentParam = `#{"student_id":"${this.props.student.id}"}`;
- const speedGraderUrlParams = this.props.anonymousModeratedMarkingEnabled && this.props.assignment.anonymousGrading
+ const speedGraderUrlParams = this.props.assignment.anonymousGrading
? assignmentParam
: `${assignmentParam}${studentParam}`
const speedGraderUrl = encodeURI(`/courses/${this.props.courseId}/gradebook/speed_grader?${speedGraderUrlParams}`)
diff --git a/app/jsx/gradezilla/shared/AssignmentMuterDialogManager.js b/app/jsx/gradezilla/shared/AssignmentMuterDialogManager.js
index b0a9cfc9a70..dabcfdcdd87 100644
--- a/app/jsx/gradezilla/shared/AssignmentMuterDialogManager.js
+++ b/app/jsx/gradezilla/shared/AssignmentMuterDialogManager.js
@@ -19,11 +19,10 @@
import AssignmentMuter from 'compiled/AssignmentMuter'
export default class AssignmentMuterDialogManager {
- constructor(assignment, url, submissionsLoaded, anonymousModeratedMarkingEnabled) {
+ constructor(assignment, url, submissionsLoaded) {
this.assignment = assignment
this.url = url
this.submissionsLoaded = submissionsLoaded
- this.anonymousModeratedMarkingEnabled = anonymousModeratedMarkingEnabled
this.showDialog = this.showDialog.bind(this)
this.isDialogEnabled = this.isDialogEnabled.bind(this)
@@ -41,11 +40,7 @@ export default class AssignmentMuterDialogManager {
return false
}
- if (
- this.assignment.muted &&
- this.anonymousModeratedMarkingEnabled &&
- this.assignment.moderated_grading
- ) {
+ if (this.assignment.muted && this.assignment.moderated_grading) {
return this.assignment.grades_published
}
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
index f77751e38b5..1da65ec0c57 100644
--- a/app/models/assignment.rb
+++ b/app/models/assignment.rb
@@ -100,17 +100,13 @@ class Assignment < ActiveRecord::Base
validate :assignment_name_length_ok?
validates :lti_context_id, presence: true, uniqueness: true
- before_create do
- self.muted = true if moderated_grading? && anonymous_moderated_marking?
- end
-
with_options unless: :moderated_grading? do
validates :graders_anonymous_to_graders, absence: true
validates :grader_section, absence: true
validates :final_grader, absence: true
end
- with_options if: -> { moderated_grading? && anonymous_moderated_marking? } do
+ with_options if: -> { moderated_grading? } do
validates :grader_count, numericality: { greater_than: 0, message: "Number of graders must be positive" }
validate :grader_section_ok?
validate :final_grader_ok?
@@ -454,7 +450,8 @@ class Assignment < ActiveRecord::Base
:default_values,
:maintain_group_category_attribute,
:validate_assignment_overrides,
- :mute_if_changed_to_anonymous
+ :mute_if_changed_to_anonymous,
+ :mute_if_changed_to_moderated
after_save :update_submissions_and_grades_if_details_changed,
@@ -1387,11 +1384,10 @@ class Assignment < ActiveRecord::Base
def user_can_update?(user, session=nil)
return false unless context.grants_right?(user, session, :manage_assignments)
- return true unless moderated_grading? && root_account.feature_enabled?(:anonymous_moderated_marking)
+ return true unless moderated_grading?
- # When Anonymous Moderated Marking is on, a moderated assignment may only be
- # edited by the assignment's moderator (assuming one has been specified) or
- # by an account admin with 'Select Final Grader for Moderation' privileges.
+ # a moderated assignment may only be edited by the assignment's moderator (assuming one has
+ # been specified) or by an account admin with 'Select Final Grader for Moderation' privileges.
final_grader_id.blank? || permits_moderation?(user)
end
@@ -1737,7 +1733,7 @@ class Assignment < ActiveRecord::Base
opts[:assessment_request].complete unless opts[:assessment_request].rubric_association
end
- ensure_grader_can_adjudicate(grader: opts[:commenter], provisional: opts[:provisional]) do
+ ensure_grader_can_adjudicate(grader: opts[:author], provisional: opts[:provisional]) do
if opts[:comment] && Canvas::Plugin.value_to_boolean(opts[:group_comment])
uuid = CanvasSlug.generate_securish_uuid
res = find_or_create_submissions(students) do |submission|
@@ -1864,25 +1860,6 @@ class Assignment < ActiveRecord::Base
!moderated_grading? || grades_published_at.present?
end
- def student_needs_provisional_grade?(student, preloaded_counts=nil)
- # For Anonymous Moderated Marking, we aren't concerned with the assignment's
- # moderation set or the hard-coded provisional grade limit. Instead we
- # check (elsewhere) that we're below the assignment's max grader count.
- return true if anonymous_moderated_marking?
-
- pg_count = if preloaded_counts
- preloaded_counts[student.id] || 0
- else
- self.provisional_grades.not_final.where(:submissions => {:user_id => student}).count
- end
- in_moderation_set = if self.moderated_grading_selections.loaded?
- self.moderated_grading_selections.detect{|s| s.student_id == student.id}.present?
- else
- self.moderated_grading_selections.where(:student_id => student).exists?
- end
- pg_count < (in_moderation_set ? 2 : 1)
- end
-
def sections_with_visibility(user)
return context.active_course_sections unless self.differentiated_assignments_applies?
@@ -2665,7 +2642,7 @@ class Assignment < ActiveRecord::Base
def unmute!
return unless muted?
- return super unless !grades_published? && anonymous_moderated_marking? && anonymous_grading?
+ return super unless !grades_published? && anonymous_grading?
errors.add :muted, I18n.t("Anonymous moderated assignments cannot be unmuted until grades are posted")
false
end
@@ -2773,11 +2750,7 @@ class Assignment < ActiveRecord::Base
end
def permits_moderation?(user)
- if anonymous_moderated_marking?
- final_grader_id == user.id || context.account_membership_allows(user, :select_final_grade)
- else
- context.grants_right?(user, :moderate_grades)
- end
+ final_grader_id == user.id || context.account_membership_allows(user, :select_final_grade)
end
def available_moderators
@@ -2804,7 +2777,7 @@ class Assignment < ActiveRecord::Base
end
def moderated_grader_limit_reached?
- moderated_grading? && anonymous_moderated_marking? && provisional_moderation_graders.count >= grader_count
+ moderated_grading? && provisional_moderation_graders.count >= grader_count
end
def can_be_moderated_grader?(user)
@@ -2820,7 +2793,7 @@ class Assignment < ActiveRecord::Base
def can_view_other_grader_identities?(user)
return false unless context.grants_any_right?(user, :manage_grades, :view_all_grades)
- return true unless anonymous_moderated_marking? && moderated_grading?
+ return true unless moderated_grading?
return grader_names_visible_to_final_grader? if final_grader_id == user.id
return true if context.account_membership_allows(user, :select_final_grade)
@@ -2831,7 +2804,7 @@ class Assignment < ActiveRecord::Base
def can_view_other_grader_comments?(user)
return false unless context.grants_any_right?(user, :manage_grades, :view_all_grades)
- return true unless anonymous_moderated_marking? && moderated_grading?
+ return true unless moderated_grading?
return true if final_grader_id == user.id || context.account_membership_allows(user, :select_final_grade)
@@ -2845,9 +2818,7 @@ class Assignment < ActiveRecord::Base
end
def can_view_student_names?(user)
- return false unless context.grants_any_right?(user, :manage_grades, :view_all_grades)
- return true unless anonymous_moderated_marking?
- !anonymous_grading?
+ !anonymous_grading && context.grants_any_right?(user, :manage_grades, :view_all_grades)
end
private
@@ -2855,7 +2826,13 @@ class Assignment < ActiveRecord::Base
def mute_if_changed_to_anonymous
return unless anonymous_grading_changed?
- self.muted = true if anonymous_grading? && anonymous_moderated_marking?
+ self.muted = true if anonymous_grading?
+ end
+
+ def mute_if_changed_to_moderated
+ return unless moderated_grading_changed?
+
+ self.muted = true if moderated_grading?
end
def due_date_ok?
@@ -2925,10 +2902,6 @@ class Assignment < ActiveRecord::Base
end
end
- def anonymous_moderated_marking?
- root_account.feature_enabled?(:anonymous_moderated_marking)
- end
-
def clear_moderated_grading_attributes(assignment)
assignment.final_grader_id = nil
assignment.grader_count = nil
@@ -2940,7 +2913,7 @@ class Assignment < ActiveRecord::Base
def create_moderation_grader_if_needed(grader:)
return false if moderation_graders.where(user: grader).exists?
- if provisional_moderation_graders.count >= grader_count
+ if moderated_grader_limit_reached?
raise MaxGradersReachedError unless grader.id == final_grader_id
end
@@ -2960,13 +2933,12 @@ class Assignment < ActiveRecord::Base
end
# This is a helper method intended to ensure the number of provisional graders
- # for a moderated assignment (if Anonymous Moderated Marking is enabled) doesn't
- # exceed the prescribed maximum. Currently, it is used for submitting grades and
- # comments via SpeedGrader. If the assignment is not moderated, the grade/comment
- # being issued is not provisional, or Anonymous Moderated Marking is off, this
+ # for a moderated assignment doesn't exceed the prescribed maximum. Currently,
+ # it is used for submitting grades and comments via SpeedGrader. If the assignment
+ # is not moderated or the grade/comment being issued is not provisional, this
# method will simply execute the provided block without any additional checks.
def ensure_grader_can_adjudicate(grader:, provisional: false)
- unless provisional && moderated_grading? && anonymous_moderated_marking?
+ unless provisional && moderated_grading?
yield and return
end
diff --git a/app/models/assignment/speed_grader.rb b/app/models/assignment/speed_grader.rb
index ffc82b4a73a..3ce6e72f7b0 100644
--- a/app/models/assignment/speed_grader.rb
+++ b/app/models/assignment/speed_grader.rb
@@ -75,8 +75,6 @@ class Assignment
all_provisional_rubric_assessments = @grading_role == :moderator &&
(@assignment.visible_rubric_assessments_for(@user, :provisional_moderator => true) || [])
- # if we're a provisional grader, calculate whether the student needs a grade
- preloaded_pg_counts = is_provisional && @assignment.provisional_grades.not_final.group("submissions.user_id").count
ActiveRecord::Associations::Preloader.new.preload(@assignment, :moderated_grading_selections) if is_provisional
includes = [{ versions: :versionable }, :quiz_submission, :user, :attachment_associations, :assignment, :originality_reports]
@@ -90,11 +88,7 @@ class Assignment
res[:context][:students] = @students.map do |student|
json = student.as_json(include_root: false, methods: submission_comment_methods, only: student_json_fields)
json[:anonymous_id] = student_ids_to_anonymous_ids[student.id.to_s] if anonymous_students?
-
- if preloaded_pg_counts
- json[:needs_provisional_grade] = @assignment.student_needs_provisional_grade?(student, preloaded_pg_counts)
- end
-
+ json[:needs_provisional_grade] = @assignment.can_be_moderated_grader?(@user) if is_provisional
json[:rubric_assessments] = rubric_assessements_to_json(current_user_rubric_assessments.select {|assessment| assessment.user_id == student.id})
json
end
diff --git a/app/models/course.rb b/app/models/course.rb
index a6d639c33ac..5b048da8c9a 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -3181,8 +3181,6 @@ class Course < ActiveRecord::Base
end
def moderators
- return [] unless root_account.feature_enabled?(:anonymous_moderated_marking)
-
active_instructors = users.merge(Enrollment.active_or_pending.of_instructor_type)
active_instructors.select { |user| grants_right?(user, :select_final_grade) }
end
diff --git a/app/models/enrollment.rb b/app/models/enrollment.rb
index d308621203f..961db77b33e 100644
--- a/app/models/enrollment.rb
+++ b/app/models/enrollment.rb
@@ -1440,7 +1440,6 @@ class Enrollment < ActiveRecord::Base
def remove_user_as_final_grader?
instructor? &&
- root_account.feature_enabled?(:anonymous_moderated_marking) &&
!other_enrollments_of_type(['TaEnrollment', 'TeacherEnrollment']).exists?
end
diff --git a/app/models/importers/assignment_importer.rb b/app/models/importers/assignment_importer.rb
index aba3adf2090..7075bcd4290 100644
--- a/app/models/importers/assignment_importer.rb
+++ b/app/models/importers/assignment_importer.rb
@@ -288,7 +288,7 @@ module Importers
[:peer_reviews,
:automatic_peer_reviews, :anonymous_peer_reviews,
:grade_group_students_individually, :allowed_extensions,
- :position, :peer_review_count, :moderated_grading,
+ :position, :peer_review_count,
:omit_from_final_grade, :intra_group_peer_reviews, :post_to_sis
].each do |prop|
item.send("#{prop}=", hash[prop]) unless hash[prop].nil?
diff --git a/app/models/moderated_grading/provisional_grade.rb b/app/models/moderated_grading/provisional_grade.rb
index 513d0679b79..f58999f090f 100644
--- a/app/models/moderated_grading/provisional_grade.rb
+++ b/app/models/moderated_grading/provisional_grade.rb
@@ -45,7 +45,7 @@ class ModeratedGrading::ProvisionalGrade < ActiveRecord::Base
scope :not_final, -> { where(:final => false)}
def must_be_final_or_student_in_need_of_provisional_grade
- if !self.final && !self.submission.assignment.student_needs_provisional_grade?(self.submission.user)
+ if !self.final && !self.submission.assignment.can_be_moderated_grader?(self.scorer)
raise(Assignment::GradeError, "Student already has the maximum number of provisional grades")
end
end
diff --git a/app/models/role_override.rb b/app/models/role_override.rb
index 998a983438a..c182216498c 100644
--- a/app/models/role_override.rb
+++ b/app/models/role_override.rb
@@ -910,14 +910,12 @@ class RoleOverride < ActiveRecord::Base
:select_final_grade => {
:label => -> { t('Select final grade for moderation') },
:true_for => %w(AccountAdmin TeacherEnrollment TaEnrollment),
- :available_to => %w(AccountAdmin AccountMembership TeacherEnrollment TaEnrollment),
- :account_allows => lambda {|a| a.feature_enabled?(:anonymous_moderated_marking)}
+ :available_to => %w(AccountAdmin AccountMembership TeacherEnrollment TaEnrollment)
},
:view_audit_trail => {
:label => -> { t('View audit trail') },
:true_for => %w(TeacherEnrollment AccountAdmin),
- :available_to => %w(TeacherEnrollment AccountAdmin AccountMembership),
- :account_allows => lambda {|a| a.feature_enabled?(:anonymous_moderated_marking)}
+ :available_to => %w(TeacherEnrollment AccountAdmin AccountMembership)
}
})
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 3e8657b6d34..45bb6c4f046 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -462,7 +462,6 @@ class Submission < ActiveRecord::Base
end
def can_view_details?(user)
- return true unless self.assignment.root_account.feature_enabled?(:anonymous_moderated_marking)
return true unless self.assignment.anonymous_grading && self.assignment.muted
user == self.user || Account.site_admin.grants_right?(user, :update)
end
@@ -1509,9 +1508,7 @@ class Submission < ActiveRecord::Base
def can_grade_symbolic_status(user = nil)
user ||= grader
- if assignment.root_account&.feature_enabled?(:anonymous_moderated_marking)
- return :moderation_in_progress unless assignment.grades_published? || grade_posting_in_progress
- end
+ return :moderation_in_progress unless assignment.grades_published? || grade_posting_in_progress || assignment.permits_moderation?(user)
return :not_applicable if deleted?
return :unpublished unless assignment.published?
diff --git a/app/views/gradebooks/speed_grader.html.erb b/app/views/gradebooks/speed_grader.html.erb
index 8f5c09a0913..f8d0ec988bb 100644
--- a/app/views/gradebooks/speed_grader.html.erb
+++ b/app/views/gradebooks/speed_grader.html.erb
@@ -53,31 +53,7 @@
- <% unless @anonymous_moderated_marking_enabled %>
-
- <% end %>
-
- <% if help_link && !@anonymous_moderated_marking_enabled %>
- <%= link_to help_link_url,
- class: help_link_classes(["Button Button--icon-action gradebookActions__Button exclude_external_icon"]),
- title: help_link_name,
- data: help_link_data do %>
- <%= svg_icon help_link_icon %>
-
- <% end %>
- <% end %>
-
- <% if @anonymous_moderated_marking_enabled %>
-
- <% else %>
-
- <% end %>
+
@@ -280,10 +256,7 @@
<% if can_do(@context, @current_user, :manage_grades) || (@context.concluded? && can_do(@context, @current_user, :read_as_admin)) %>
`;
- sinon.stub($, 'getJSON');
- sinon.stub($, 'ajaxJSON');
sinon.stub(SpeedGrader.EG, 'showSubmission');
sinon.stub($.fn, 'ready');
SpeedGrader.setup();
@@ -1993,10 +2023,7 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(() => {
window.jsonData = originalJsonData;
SpeedGrader.EG.showSubmission.restore();
- $.ajaxJSON.restore();
- $.getJSON.restore();
fixtures.innerHTML = '';
- fakeENV.teardown();
});
test('sets graded_anonymously to true for the rubric ajax request', () => {
@@ -2019,8 +2046,6 @@ QUnit.module('SpeedGrader', function() {
show_help_menu_item: false
});
fixtures.innerHTML = '';
- sinon.stub($, 'getJSON');
- sinon.stub($, 'ajaxJSON');
sinon.stub($.fn, 'ready');
SpeedGrader.setup();
window.jsonData = windowJsonData;
@@ -2030,10 +2055,7 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(() => {
window.jsonData = originalJsonData;
- $.ajaxJSON.restore();
- $.getJSON.restore();
fixtures.innerHTML = '';
- fakeENV.teardown();
});
test('fetches student via anonymous_id', () => {
@@ -2053,18 +2075,13 @@ QUnit.module('SpeedGrader', function() {
show_help_menu_item: false
})
fixtures.innerHTML = ''
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
})
@@ -2101,8 +2118,6 @@ QUnit.module('SpeedGrader', function() {
RUBRIC_ASSESSMENT: {}
})
fixtures.innerHTML = ''
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
@@ -2111,10 +2126,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2142,8 +2154,6 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
@@ -2152,10 +2162,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2182,8 +2189,6 @@ QUnit.module('SpeedGrader', function() {
fixtures.innerHTML = `
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
@@ -2192,10 +2197,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2227,8 +2229,6 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
@@ -2241,9 +2241,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2252,25 +2250,23 @@ QUnit.module('SpeedGrader', function() {
test('calls ajaxJSON with submission url with anonymous id', () => {
$.ajaxJSON.restore()
- const ajaxJSON = sinon.stub($, 'ajaxJSON')
+ sinon.stub($, 'ajaxJSON')
SpeedGrader.EG.addSubmissionComment('draft comment')
- const [url] = ajaxJSON.firstCall.args
+ const [url] = $.ajaxJSON.firstCall.args
deepEqual(url, `${assignmentURL}/submissions/${alphaStudent.anonymous_id}`)
- ajaxJSON.restore()
})
test('calls ajaxJSON with with anonymous id in data', () => {
$.ajaxJSON.restore()
- const ajaxJSON = sinon.stub($, 'ajaxJSON')
+ sinon.stub($, 'ajaxJSON')
SpeedGrader.EG.addSubmissionComment('draft comment')
- const [,,formData] = ajaxJSON.firstCall.args
+ const [,,formData] = $.ajaxJSON.firstCall.args
strictEqual(formData['submission[anonymous_id]'], alphaStudent.anonymous_id)
- ajaxJSON.restore()
})
test('calls handleGradingError if an error is encountered', () => {
$.ajaxJSON.restore()
- const ajaxJSON = sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => {
+ sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => {
error()
})
const handleGradingError = sinon.stub(SpeedGrader.EG, 'handleGradingError')
@@ -2281,12 +2277,11 @@ QUnit.module('SpeedGrader', function() {
revertFromFormSubmit.restore()
handleGradingError.restore()
- ajaxJSON.restore()
})
test('calls revertFromFormSubmit to clear the comment if an error is encountered', () => {
$.ajaxJSON.restore()
- const ajaxJSON = sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => {
+ sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => {
error()
})
const revertFromFormSubmit = sinon.stub(SpeedGrader.EG, 'revertFromFormSubmit')
@@ -2296,7 +2291,6 @@ QUnit.module('SpeedGrader', function() {
deepEqual(params, {errorSubmitting: true})
revertFromFormSubmit.restore()
- ajaxJSON.restore()
})
})
@@ -2316,20 +2310,15 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- const ajaxJSON = sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
SpeedGrader.EG.jsonReady()
setupCurrentStudent()
- ajaxJSON.restore()
})
hooks.afterEach(() => {
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2337,34 +2326,33 @@ QUnit.module('SpeedGrader', function() {
})
test('calls isStudentConcluded with student looked up by anonymous id', () => {
- const ajaxJSON = sinon.stub($, 'ajaxJSON')
const isStudentConcluded = sinon.spy(SpeedGrader.EG, 'isStudentConcluded')
SpeedGrader.EG.handleGradeSubmit({}, false)
deepEqual(isStudentConcluded.firstCall.args, [alphaStudent.anonymous_id])
- ajaxJSON.restore()
})
- test('calls ajaxJSON with with anonymous id in data', () => {
- const ajaxJSON = sinon.stub($, 'ajaxJSON')
+ test('calls ajaxJSON with anonymous id in data', () => {
+ $.ajaxJSON.restore()
+ sinon.stub($, 'ajaxJSON')
SpeedGrader.EG.handleGradeSubmit({}, false)
- const [,,formData] = ajaxJSON.firstCall.args
+ const [,,formData] = $.ajaxJSON.firstCall.args
strictEqual(formData['submission[anonymous_id]'], alphaStudent.anonymous_id)
- ajaxJSON.restore()
})
test('calls handleGradingError if an error is encountered', () => {
- const ajaxJSON = sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => { error() })
+ $.ajaxJSON.restore()
+ sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => { error() })
const handleGradingError = sinon.stub(SpeedGrader.EG, 'handleGradingError')
SpeedGrader.EG.handleGradeSubmit({}, false)
strictEqual(handleGradingError.callCount, 1)
handleGradingError.restore()
- ajaxJSON.restore()
})
test('clears the grade input if an error is encountered', () => {
- const ajaxJSON = sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => { error() })
+ $.ajaxJSON.restore()
+ sinon.stub($, 'ajaxJSON').callsFake((_url, _method, _form, _success, error) => { error() })
const handleGradingError = sinon.stub(SpeedGrader.EG, 'handleGradingError')
const showGrade = sinon.stub(SpeedGrader.EG, 'showGrade')
@@ -2373,15 +2361,14 @@ QUnit.module('SpeedGrader', function() {
showGrade.restore()
handleGradingError.restore()
- ajaxJSON.restore()
})
test('submission is always marked as graded anonymously', () => {
- const ajaxJSON = sinon.stub($, 'ajaxJSON');
+ $.ajaxJSON.restore()
+ sinon.stub($, 'ajaxJSON')
SpeedGrader.EG.handleGradeSubmit({}, false);
- const [,,formData] = ajaxJSON.firstCall.args;
+ const [,,formData] = $.ajaxJSON.firstCall.args;
strictEqual(formData['submission[graded_anonymously]'], true);
- ajaxJSON.restore();
});
})
@@ -2400,8 +2387,6 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
window.jsonData.rubric_association = {}
@@ -2410,10 +2395,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2450,8 +2432,6 @@ QUnit.module('SpeedGrader', function() {
<%= render partial: "grading_box_extended",
- locals: {
- assignment: @assignment,
- anonymous_moderated_marking_enabled: @anonymous_moderated_marking_enabled
- }
+ locals: {assignment: @assignment}
%>
<%= t('links.submit_same_score', "Use this same grade for the resubmission") %> diff --git a/app/views/jst/assignments/EditView.handlebars b/app/views/jst/assignments/EditView.handlebars index 691d78a1105..5e3b248ef52 100644 --- a/app/views/jst/assignments/EditView.handlebars +++ b/app/views/jst/assignments/EditView.handlebars @@ -161,22 +161,7 @@ {{/if}} {{#unless isQuizLTIAssignment}} - {{#if anonymousModeratedMarkingEnabled}} - - {{else}} - - {{/if}} + {{/unless}} {{#if anonymousGradingEnabled}} diff --git a/lib/api/v1/assignment.rb b/lib/api/v1/assignment.rb index dc64ca60e42..f0c1f63eecd 100644 --- a/lib/api/v1/assignment.rb +++ b/lib/api/v1/assignment.rb @@ -682,7 +682,7 @@ module Api::V1::Assignment assignment.moderated_grading = value_to_boolean(assignment_params['moderated_grading']) end - grader_changes = final_grader_changes(assignment, context, assignment_params) + grader_changes = final_grader_changes(assignment, assignment_params) assignment.final_grader_id = grader_changes.grader_id if grader_changes.grader_changed? if assignment_params.key?('anonymous_grading') && assignment.course.feature_enabled?(:anonymous_marking) @@ -773,10 +773,9 @@ module Api::V1::Assignment private - def final_grader_changes(assignment, course, assignment_params) + def final_grader_changes(assignment, assignment_params) no_changes = OpenStruct.new(grader_changed?: false) return no_changes unless assignment.moderated_grading && assignment_params.key?('final_grader_id') - return no_changes unless course.root_account.feature_enabled?(:anonymous_moderated_marking) final_grader_id = assignment_params.fetch("final_grader_id") return OpenStruct.new(grader_changed?: true, grader_id: nil) if final_grader_id.blank? diff --git a/lib/feature.rb b/lib/feature.rb index a9b3be419fe..53d912e6bdb 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -69,7 +69,7 @@ class Feature # display_name: -> { I18n.t('features.automatic_essay_grading', 'Automatic Essay Grading') }, # description: -> { I18n.t('features.automatic_essay_grading_description, 'Popup text describing the feature goes here') }, # applies_to: 'Course', # or 'RootAccount' or 'Account' or 'User' - # state: 'allowed', # or 'off', 'on', 'hidden', or 'hidden_in_prod' + # state: 'allowed', # or 'on', 'hidden', or 'hidden_in_prod' # # - 'hidden' means the feature must be set by a site admin before it will be visible # # (in that context and below) to other users # # - 'hidden_in_prod' registers 'hidden' in production environments or 'allowed' elsewhere diff --git a/lib/features/anonymous_moderated_marking.rb b/lib/features/anonymous_moderated_marking.rb index 10b41ef8660..367fdda69c7 100644 --- a/lib/features/anonymous_moderated_marking.rb +++ b/lib/features/anonymous_moderated_marking.rb @@ -25,31 +25,21 @@ Feature.register( DESCRIPTION }, applies_to: 'Account', - state: 'allowed', + state: 'hidden', root_opt_in: true, beta: true, - development: false + development: true }, anonymous_marking: { display_name: -> { I18n.t 'Anonymous Marking' }, description: -> { I18n.t <<~DESCRIPTION - Enable anonymous marking of assignments. Only relevant if the Anonymous Moderated Marking flag is enabled. + Enable anonymous marking of assignments. DESCRIPTION }, applies_to: 'Course', state: 'allowed', root_opt_in: true, - beta: true, - development: false, - visible_on: ->(context) do - if context.is_a?(Account) - context.feature_enabled?(:anonymous_moderated_marking) - elsif context.is_a?(Course) - context.root_account.feature_enabled?(:anonymous_moderated_marking) - else - false - end - end + beta: true } ) diff --git a/lib/features/moderated_grading.rb b/lib/features/moderated_grading.rb index 9fd7c251a0e..dc5cd2068b3 100644 --- a/lib/features/moderated_grading.rb +++ b/lib/features/moderated_grading.rb @@ -21,22 +21,12 @@ Feature.register( display_name: -> { I18n.t 'Moderated Grading' }, description: -> { I18n.t <<~DESCRIPTION - Enable moderated grading. Only relevant if the Anonymous Moderated Marking flag is enabled. + Enable moderated grading. DESCRIPTION }, applies_to: 'Course', state: 'allowed', root_opt_in: true, - beta: true, - development: false, - visible_on: ->(context) do - if context.is_a?(Account) - context.feature_enabled?(:anonymous_moderated_marking) - elsif context.is_a?(Course) - context.root_account.feature_enabled?(:anonymous_moderated_marking) - else - false - end - end + beta: true } ) diff --git a/lib/gradebook_importer.rb b/lib/gradebook_importer.rb index fa390d91fa8..ad87ba18845 100644 --- a/lib/gradebook_importer.rb +++ b/lib/gradebook_importer.rb @@ -21,7 +21,7 @@ require 'csv' class GradebookImporter ASSIGNMENT_PRELOADED_FIELDS = %i/ id title points_possible grading_type updated_at context_id context_type group_category_id - created_at due_at only_visible_to_overrides + created_at due_at only_visible_to_overrides moderated_grading /.freeze class NegativeId diff --git a/lib/moderation.rb b/lib/moderation.rb index e691e7153f4..07735c1dee7 100644 --- a/lib/moderation.rb +++ b/lib/moderation.rb @@ -18,7 +18,7 @@ module Moderation def create_moderation_selections_for_assignment(assignment_id, student_ids, student_context) assignment = Assignment.find(assignment_id) - return unless assignment.root_account.feature_enabled?(:anonymous_moderated_marking) && assignment.moderated_grading + return unless assignment.moderated_grading # Add selections for students in Student IDs already_moderated_ids = assignment.moderated_grading_selections.pluck(:student_id) diff --git a/public/javascripts/speed_grader.js b/public/javascripts/speed_grader.js index 8856cdbff12..0899ccdf1d4 100644 --- a/public/javascripts/speed_grader.js +++ b/public/javascripts/speed_grader.js @@ -45,7 +45,6 @@ import htmlEscape from './str/htmlEscape'; import rubricAssessment from './rubric_assessment'; import SpeedgraderSelectMenu from './speed_grader_select_menu'; import SpeedgraderHelpers, { - isAnonymousModeratedMarkingEnabled, setupAnonymizableId, setupAnonymizableStudentId, setupAnonymizableUserId, @@ -471,13 +470,7 @@ function setupHeader () { modal: $('#unmute_dialog') }, nav: $gradebook_header.find('#prev-student-button, #next-student-button'), - settings: { - form: $('#settings_form'), - link: $('#settings_link') - }, - keyinfo: { - icon: $('#keyboard-shortcut-info-icon') - } + settings: { form: $('#settings_form') } }, courseId: utils.getParam('courses'), assignmentId: utils.getParam('assignment_id'), @@ -492,10 +485,6 @@ function setupHeader () { this.elements.mute.link.click($.proxy(this.onMuteClick, this)); this.elements.settings.form.submit(this.submitSettingsForm.bind(this)); - if (!isAnonymous) { - this.elements.settings.link.click(this.showSettingsModal.bind(this)); - } - this.elements.keyinfo.icon.click(this.keyboardShortcutInfoModal.bind(this)); }, createModals () { this.elements.settings.form.dialog({ @@ -1346,20 +1335,18 @@ EG = { } if (ENV.grading_role == "moderator") { this.current_prov_grade_index = null; - this.handleModerationTabs(0); // sets up tabs and loads first grade + this.removeModerationBarAndShowSubmission(); - if (isAnonymousModeratedMarkingEnabled()) { - this.renderProvisionalGradeSelector({showingNewStudent: true}) + this.renderProvisionalGradeSelector({showingNewStudent: true}) - const selectedGrade = currentStudentProvisionalGrades().find(grade => grade.selected); - if (selectedGrade) { - this.setActiveProvisionalGradeFields({ - label: provisionalGraderDisplayNames[selectedGrade.provisional_grade_id], - grade: selectedGrade - }); - } else { - this.setActiveProvisionalGradeFields(); - } + const selectedGrade = currentStudentProvisionalGrades().find(grade => grade.selected); + if (selectedGrade) { + this.setActiveProvisionalGradeFields({ + label: provisionalGraderDisplayNames[selectedGrade.provisional_grade_id], + grade: selectedGrade + }); + } else { + this.setActiveProvisionalGradeFields(); } } else { // showSubmissionOverride is optionally set if the user is @@ -1387,94 +1374,6 @@ EG = { this.setReadOnly(false) }, - handleModerationTabs: function(index_to_load) { - if (isAnonymousModeratedMarkingEnabled()) { - this.removeModerationBarAndShowSubmission() - return - } - - var prov_grades = this.currentStudent.submission && this.currentStudent.submission.provisional_grades; - var final_grade = this.currentStudent.submission && this.currentStudent.submission.final_provisional_grade; - - if (prov_grades && prov_grades.length == 1 && !final_grade && !prov_grades[0].readonly) { - $full_width_container.removeClass("with_moderation_tabs"); - $moderation_bar.hide(); - EG.showProvisionalGrade(0); - } else if (prov_grades && prov_grades.length > 0) { - if (prov_grades.length == 1) { - // hide and disable second mark tab - $moderation_tab_2nd.hide(); - $moderation_tabs_div.tabs('disable', 1); - - if (this.currentStudent.needs_provisional_grade || final_grade) { - $new_mark_container.show(); - $new_mark_copy_link2_menu_item.hide(); // hide copy 2nd mark - if (final_grade) { - $new_mark_link_menu_item.hide(); - } else { - EG.can_add_review = true; - $new_mark_link_menu_item.show(); - } - } else { - $new_mark_container.hide(); // hide new mark dropdown if not selected for moderation - } - } else if (prov_grades.length == 2) { - // enable and show second mark tab - $moderation_tabs_div.tabs('enable', 1); - $moderation_tab_2nd.show(); - $new_mark_container.show(); - $new_mark_link_menu_item.hide(); - if (prov_grades[1].provisional_grade_id) { - $new_mark_copy_link2_menu_item.show(); // show copy 2nd mark - } else { - $new_mark_copy_link2_menu_item.hide(); // don't show if it's a new unsaved mark - } - } - - if (final_grade) { - $moderation_tabs_div.tabs('enable', 2); - $moderation_tab_final.show(); - $new_mark_final_link_menu_item.hide(); - } else { - $moderation_tabs_div.tabs('disable', 2); - $moderation_tab_final.hide(); - $new_mark_final_link_menu_item.show(); - } - - $full_width_container.addClass("with_moderation_tabs"); - $moderation_bar.show(); - - if (this.add_review && this.can_add_review) { - this.add_review = false; - this.newProvisionalGrade('new', 1); - } else { - if (this.selected_provisional_grade_id) { - var selected_id = this.selected_provisional_grade_id; - // load provisional grade id from anchor hash - - if (final_grade && final_grade.provisional_grade_id == selected_id) { - index_to_load = 'final'; // final mark - } else { - $.each(prov_grades, function (idx, pg) { - if (pg.provisional_grade_id == selected_id) { - index_to_load = idx; - } - }); - } - - this.selected_provisional_grade_id = null; // don't load it again - } - if (index_to_load == 'final') { - $moderation_tab_final.find('a').click(); - } else { - $moderation_tabs.eq(index_to_load).find('a').click(); // show a grade - } - } - } else { - this.removeModerationBarAndShowSubmission() - } - }, - updateModerationTabs: function() { if (!this.currentStudent.submission) return; var prov_grades = this.currentStudent.submission.provisional_grades; @@ -1547,11 +1446,10 @@ EG = { }; if (index == 1) { this.currentStudent.submission.provisional_grades.push(new_mark); - this.handleModerationTabs(1); } else if (index == 'final') { this.currentStudent.submission.final_provisional_grade = new_mark; - this.handleModerationTabs('final'); } + this.removeModerationBarAndShowSubmission(); } else if (type == 'copy') { if (!this.currentStudent.submission.final_provisional_grade || confirm(I18n.t("Are you sure you want to copy to the final mark? This will overwrite the existing mark."))) { @@ -1564,7 +1462,7 @@ EG = { EG.currentStudent.submission_state = SpeedgraderHelpers.submissionState(EG.currentStudent, ENV.grading_role); EG.current_prov_grade_index = null; - EG.handleModerationTabs('final'); + this.removeModerationBarAndShowSubmission(); EG.updateModerationTabs(); $moderation_tab_final.focus(); }) @@ -2648,11 +2546,7 @@ EG = { $multiple_submissions.change(); EG.showGrade(); - if ( - isAnonymousModeratedMarkingEnabled() && - ENV.grading_role === 'moderator' && - currentStudentProvisionalGrades().length > 0 - ) { + if (ENV.grading_role === 'moderator' && currentStudentProvisionalGrades().length > 0) { // This is the ID of the possibly-new grade that the server returned const newProvisionalGradeId = submissions[0].submission.provisional_grade_id; const existingGrade = currentStudentProvisionalGrades().find( @@ -3201,10 +3095,7 @@ function currentStudentProvisionalGrades () { export default { setup () { setupSelectors() - - if (isAnonymousModeratedMarkingEnabled()) { - renderSettingsMenu() - } + renderSettingsMenu() function registerQuizzesNext (overriddenShowSubmission) { showSubmissionOverride = overriddenShowSubmission; diff --git a/public/javascripts/speed_grader_helpers.js b/public/javascripts/speed_grader_helpers.js index f2f45e15e46..e814c45ae6e 100644 --- a/public/javascripts/speed_grader_helpers.js +++ b/public/javascripts/speed_grader_helpers.js @@ -22,12 +22,8 @@ import I18n from 'i18n!gradebook' import './jquery.instructure_date_and_time' import './jquery.instructure_misc_helpers' -export function isAnonymousModeratedMarkingEnabled () { - return !!ENV.anonymous_moderated_marking_enabled -} - export function setupIsAnonymous ({anonymous_grading}) { - return isAnonymousModeratedMarkingEnabled() && anonymous_grading + return anonymous_grading } export function setupAnonymizableId (isAnonymous) { @@ -168,8 +164,7 @@ export function setupAnonymizableUserId (isAnonymous) { setupIsAnonymous, setupAnonymizableId, setupAnonymizableUserId, - setupAnonymizableStudentId, - isAnonymousModeratedMarkingEnabled + setupAnonymizableStudentId } export default speedgraderHelpers diff --git a/spec/apis/lti/originality_reports_api_spec.rb b/spec/apis/lti/originality_reports_api_spec.rb index fe34d8e8b6e..1774ed1455a 100644 --- a/spec/apis/lti/originality_reports_api_spec.rb +++ b/spec/apis/lti/originality_reports_api_spec.rb @@ -59,7 +59,6 @@ module Lti create: "/api/lti/assignments/#{@assignment.id}/submissions/#{@submission.id}/originality_report" } - allow_any_instance_of(Account).to receive(:feature_enabled?).with(:anonymous_moderated_marking).and_return(false) allow_any_instance_of(Account).to receive(:feature_enabled?).with(:plagiarism_detection_platform).and_return(true) end diff --git a/spec/apis/v1/anonymous_provisional_grades_api_spec.rb b/spec/apis/v1/anonymous_provisional_grades_api_spec.rb index 09f6f05081d..002809bec22 100644 --- a/spec/apis/v1/anonymous_provisional_grades_api_spec.rb +++ b/spec/apis/v1/anonymous_provisional_grades_api_spec.rb @@ -26,7 +26,7 @@ describe 'Anonymous Provisional Grades API', type: :request do course_with_teacher(active_all: true) ta_in_course(active_all: true) @student = student_in_course(active_all: true).user - @assignment = @course.assignments.create!(moderated_grading: true) + @assignment = @course.assignments.create!(moderated_grading: true, grader_count: 1) @submission = @assignment.submit_homework(@student, body: 'EHLO') @path = "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/anonymous_provisional_grades/status" @params = { diff --git a/spec/apis/v1/assignments_api_spec.rb b/spec/apis/v1/assignments_api_spec.rb index 046ad31d94b..dc9829c308f 100644 --- a/spec/apis/v1/assignments_api_spec.rb +++ b/spec/apis/v1/assignments_api_spec.rb @@ -2528,144 +2528,119 @@ describe AssignmentsApiController, type: :request do describe 'final_grader_id' do before(:once) do course_with_teacher(active_all: true) + course_with_teacher(active_all: true) end - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - course_with_teacher(active_all: true) - @course.root_account.enable_feature!(:anonymous_moderated_marking) - end - - it 'allows updating final_grader_id for a participating instructor with "Select Final Grade" permissions' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - expect(json_parse(response.body)['final_grader_id']).to eq @teacher.id - end - - it 'does not allow updating final_grader_id if the user does not have "Select Final Grade" permissions' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - @course.root_account.role_overrides.create!( - permission: 'select_final_grade', - role: teacher_role, - enabled: false - ) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'user does not have permission to select final grade' - end - - it 'does not allow updating final_grader_id if the user is not active in the course' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - deactivated_teacher = User.create! - deactivated_teacher = @course.enroll_teacher(deactivated_teacher, enrollment_state: 'inactive') - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: deactivated_teacher.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'course has no active instructors with this ID' - end - - it 'does not allow updating final_grader_id if the course has no user with the supplied ID' do - user_not_enrolled_in_course = User.create! - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: user_not_enrolled_in_course.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'course has no active instructors with this ID' - end - - it 'skips final_grader_id validation if the field has not changed' do - assignment = @course.assignments.create!( - final_grader: @teacher, - grader_count: 2, - moderated_grading: true, - name: 'Some Assignment' - ) - @course.root_account.role_overrides.create!( - permission: 'select_final_grade', - role: teacher_role, - enabled: false - ) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { name: 'a fancy new name' } }, - ) - expect(response).to be_success - end + it 'allows updating final_grader_id for a participating instructor with "Select Final Grade" permissions' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: @teacher.id } }, + ) + expect(json_parse(response.body)['final_grader_id']).to eq @teacher.id end - context 'when Anonymous Moderated Marking is disabled' do - it 'ignores updates to final_grader_id' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - expect(json_parse(response.body)['final_grader_id']).to be_nil - end + it 'does not allow updating final_grader_id if the user does not have "Select Final Grade" permissions' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + @course.root_account.role_overrides.create!( + permission: 'select_final_grade', + role: teacher_role, + enabled: false + ) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: @teacher.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'user does not have permission to select final grade' + end + + it 'does not allow updating final_grader_id if the user is not active in the course' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + deactivated_teacher = User.create! + deactivated_teacher = @course.enroll_teacher(deactivated_teacher, enrollment_state: 'inactive') + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: deactivated_teacher.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'course has no active instructors with this ID' + end + + it 'does not allow updating final_grader_id if the course has no user with the supplied ID' do + user_not_enrolled_in_course = User.create! + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: user_not_enrolled_in_course.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'course has no active instructors with this ID' + end + + it 'skips final_grader_id validation if the field has not changed' do + assignment = @course.assignments.create!( + final_grader: @teacher, + grader_count: 2, + moderated_grading: true, + name: 'Some Assignment' + ) + @course.root_account.role_overrides.create!( + permission: 'select_final_grade', + role: teacher_role, + enabled: false + ) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { name: 'a fancy new name' } }, + ) + expect(response).to be_success end end it 'allows updating grader_count' do course_with_teacher(active_all: true) - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true) + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 1) api_call( :put, "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", @@ -4546,7 +4521,6 @@ describe AssignmentsApiController, type: :request do context "when the anonymous marking feature flag is set" do before(:once) do - @course.account.enable_feature!(:anonymous_moderated_marking) @course.enable_feature!(:anonymous_marking) end diff --git a/spec/apis/v1/moderation_set_api_spec.rb b/spec/apis/v1/moderation_set_api_spec.rb index f9104a0a452..90db1f608c4 100644 --- a/spec/apis/v1/moderation_set_api_spec.rb +++ b/spec/apis/v1/moderation_set_api_spec.rb @@ -26,13 +26,13 @@ describe 'Moderated Grades API', type: :request do sec2 = @course.course_sections.create!(:name => "section 2") @assignment = @course.assignments.create! name: "asdf" @assignment.update_attribute :moderated_grading, true + @assignment.update_attribute :grader_count, 1 @student1, @student2, @student3 = n_students_in_course(3, course: @course) @course.enroll_student(@student1, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student2, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student3, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student3, :section => sec2, :allow_multiple_enrollments => true) @user = @teacher - @assignment.moderated_grading_selections.create! student: @student1 end before :each do @@ -46,7 +46,7 @@ describe 'Moderated Grades API', type: :request do {controller: 'moderation_set', action: 'index', format: 'json', course_id: @course.id, assignment_id: @assignment.id} expect(response).to be_success - expect(json.size).to eq 1 + expect(json.size).to eq 3 expect(json.first["id"]).to eq @student1.id end diff --git a/spec/apis/v1/provisional_grades_api_spec.rb b/spec/apis/v1/provisional_grades_api_spec.rb index d996a33cd4d..c74885a7eab 100644 --- a/spec/apis/v1/provisional_grades_api_spec.rb +++ b/spec/apis/v1/provisional_grades_api_spec.rb @@ -26,7 +26,9 @@ describe 'Provisional Grades API', type: :request do course_with_student :active_all => true ta_in_course :active_all => true @assignment = @course.assignments.build + @assignment.grader_count = 1 @assignment.moderated_grading = true + @assignment.final_grader_id = @teacher.id @assignment.save! subs = @assignment.grade_student @student, :grader => @ta, :score => 0, :provisional => true @pg = subs.first.provisional_grade(@ta) @@ -37,52 +39,45 @@ describe 'Provisional Grades API', type: :request do end it "should fail if the student isn't in the moderation set" do + @assignment.moderated_grading_selections.destroy_all json = api_call_as_user(@teacher, :put, @path, @params, {}, {}, { :expected_status => 400 }) expect(json['message']).to eq 'student not in moderation set' end - context "with moderation set" do - before(:once) do - @selection = @assignment.moderated_grading_selections.build - @selection.student_id = @student.id - @selection.save! - end - - it "should require :moderate_grades" do - api_call_as_user(@ta, :put, @path, @params, {}, {}, { :expected_status => 401 }) - end - - it "should select a provisional grade" do - json = api_call_as_user(@teacher, :put, @path, @params) - expect(json).to eq({ - 'assignment_id' => @assignment.id, - 'student_id' => @student.id, - 'selected_provisional_grade_id' => @pg.id - }) - expect(@selection.reload.provisional_grade).to eq(@pg) - end - - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :put - - it "should use anonymous_id instead of student_id if user cannot view student names" do - allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false - json = api_call_as_user(@teacher, :put, @path, @params) - expect(json).to eq({ - 'assignment_id' => @assignment.id, - 'anonymous_id' => @pg.submission.anonymous_id, - 'selected_provisional_grade_id' => @pg.id - }) - expect(@selection.reload.provisional_grade).to eq(@pg) - end + it "should select a provisional grade" do + json = api_call_as_user(@teacher, :put, @path, @params) + expect(json).to eq({ + 'assignment_id' => @assignment.id, + 'student_id' => @student.id, + 'selected_provisional_grade_id' => @pg.id + }) + expect(@assignment.moderated_grading_selections.where(student_id: @student.id).first.provisional_grade).to eq(@pg) end + + it "should use anonymous_id instead of student_id if user cannot view student names" do + allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false + json = api_call_as_user(@teacher, :put, @path, @params) + expect(json).to eq({ + 'assignment_id' => @assignment.id, + 'anonymous_id' => @pg.submission.anonymous_id, + 'selected_provisional_grade_id' => @pg.id + }) + expect(@assignment.moderated_grading_selections.where(student_id: @student.id).first.provisional_grade).to eq(@pg) + end + + it_behaves_like 'authorization for provisional final grade selection', :put end describe "copy_to_final_mark" do before(:once) do course_with_student :active_all => true ta_in_course :active_all => true - @assignment = @course.assignments.create! submission_types: 'online_text_entry', moderated_grading: true - @assignment.moderated_grading_selections.create! student: @student + @assignment = @course.assignments.create!( + submission_types: 'online_text_entry', + moderated_grading: true, + grader_count: 1, + final_grader_id: @teacher.id + ) @submission = @assignment.submit_homework(@student, :submission_type => 'online_text_entry', :body => 'hallo') @pg = @submission.find_or_create_provisional_grade!(@ta, score: 80) @submission.add_comment(:commenter => @ta, :comment => 'huttah!', :provisional => true) @@ -121,7 +116,7 @@ describe 'Provisional Grades API', type: :request do expect(json['crocodoc_urls']).to eq([]) end - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :post + it_behaves_like 'authorization for provisional final grade selection', :post end describe "publish" do @@ -135,6 +130,7 @@ describe 'Provisional Grades API', type: :request do end it "requires a moderated assignment" do + @assignment.update_attribute :final_grader_id, @teacher.id json = api_call_as_user(@teacher, :post, @path, @params, {}, {}, { :expected_status => 400 }) expect(json['message']).to eq 'Assignment does not use moderated grading' end @@ -142,16 +138,14 @@ describe 'Provisional Grades API', type: :request do context "with moderated assignment" do before(:once) do @assignment.update_attribute :moderated_grading, true + @assignment.update_attribute :grader_count, 2 + @assignment.update_attribute :final_grader_id, @teacher.id end it "responds with a 200 for a valid request" do api_call_as_user(@teacher, :post, @path, @params, {}, {}, expected_status: 200) end - it "requires moderate_grades permissions" do - api_call_as_user(@ta, :post, @path, @params, {}, {}, { :expected_status => 401 }) - end - it "requires manage_grades permissions" do @course.root_account.role_overrides.create!( permission: :manage_grades, @@ -209,12 +203,6 @@ describe 'Provisional Grades API', type: :request do end it "publishes provisional grades" do - @student.communication_channels.create(:path => 'student@example.edu', :path_type => 'email').confirm - n = Notification.create!(:name => 'Submission Graded', :category => 'TestImmediately') - NotificationPolicy.create!(:notification => n, - :communication_channel => @student.communication_channel, - :frequency => 'immediately') - expect(@submission.workflow_state).to eq 'submitted' expect(@submission.score).to be_nil expect(@student.messages).to be_empty @@ -227,15 +215,12 @@ describe 'Provisional Grades API', type: :request do @assignment.reload expect(@assignment.grades_published_at).to be_within(1.minute.to_i).of(Time.now.utc) - - @student.reload - expect(@student.messages.map(&:notification_name)).to be_include 'Submission Graded' end it "publishes the selected provisional grade when the student is in the moderation set" do @submission.provisional_grade(@ta).update_attribute(:graded_at, 1.minute.ago) - sel = @assignment.moderated_grading_selections.create!(:student => @student) + sel = @assignment.moderated_grading_selections.find_by(student: @student) @other_ta = user_factory :active_user => true @course.enroll_ta @other_ta, :enrollment_state => 'active' @@ -255,9 +240,7 @@ describe 'Provisional Grades API', type: :request do context "with one provisional grade" do it "publishes the only provisional grade if none have been explicitly selected" do course_with_user("TaEnrollment", course: @course, active_all: true) - second_ta = @user @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @assignment.grade_student(@student, grader: @ta, score: 72, provisional: true) api_call_as_user(@teacher, :post, @path, @params) @@ -274,7 +257,6 @@ describe 'Provisional Grades API', type: :request do it "publishes even when some submissions have no grades" do @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @user = @teacher raw_api_call(:post, @path, @params) @@ -286,7 +268,6 @@ describe 'Provisional Grades API', type: :request do it "does not publish if none have been explicitly selected" do @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @assignment.grade_student(@student, grader: @ta, score: 72, provisional: true) @assignment.grade_student(@student, grader: @second_ta, score: 88, provisional: true) @@ -303,8 +284,7 @@ describe 'Provisional Grades API', type: :request do student_2 = student_in_course(active_all: true, course: @course).user submission_1 = @assignment.submit_homework(student_1, body: "hello") submission_2 = @assignment.submit_homework(student_2, body: "hello") - selection_1 = @assignment.moderated_grading_selections.create!(student: student_1) - @assignment.moderated_grading_selections.create!(student: student_2) + selection_1 = @assignment.moderated_grading_selections.find_by(student: student_1) @assignment.grade_student(student_1, grader: @ta, score: 12, provisional: true) @assignment.grade_student(student_1, grader: @second_ta, score: 34, provisional: true) @assignment.grade_student(student_2, grader: @ta, score: 56, provisional: true) @@ -322,7 +302,7 @@ describe 'Provisional Grades API', type: :request do end end - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :post + it_behaves_like 'authorization for provisional final grade selection', :post end end end diff --git a/spec/apis/v1/submissions_api_spec.rb b/spec/apis/v1/submissions_api_spec.rb index 786f6ed300a..e5673cfa1eb 100644 --- a/spec/apis/v1/submissions_api_spec.rb +++ b/spec/apis/v1/submissions_api_spec.rb @@ -1729,6 +1729,7 @@ describe 'Submissions API', type: :request do points_possible: 10 ) @assignment.update_attribute(:moderated_grading, true) + @assignment.update_attribute(:grader_count, 2) submission = @assignment.submit_homework(@student, body: 'nice work') @provisional_grade = submission.provisional_grades.build do |grade| grade.scorer = @teacher @@ -2805,7 +2806,10 @@ describe 'Submissions API', type: :request do end it "creates a provisional grade and comment" do - @assignment.update_attribute(:moderated_grading, true) + @assignment.moderated_grading = true + @assignment.grader_count = 2 + @assignment.final_grader = @teacher + @assignment.save! submission = @assignment.submit_homework(@student, :body => 'what') json = api_call( @@ -2844,7 +2848,10 @@ describe 'Submissions API', type: :request do end it "creates a provisional grade and comment when no submission exists" do - @assignment.update_attribute(:moderated_grading, true) + @assignment.moderated_grading = true + @assignment.grader_count = 2 + @assignment.final_grader = @teacher + @assignment.save! json = api_call( :put, @@ -3864,14 +3871,13 @@ describe 'Submissions API', type: :request do course_with_teacher_logged_in active_all: true student_in_course active_all: true @user = @teacher - assignment = @course.assignments.create!(moderated_grading: true) + assignment = @course.assignments.create!(moderated_grading: true, grader_count: 1) submission = assignment.submit_homework(@student, submission_type: 'online_upload', attachments: [crocodocable_attachment_model(context: @student)]) provisional_grade = submission.find_or_create_provisional_grade!(@teacher, score: 1) - assignment.moderated_grading_selections.create! do |s| - s.student = @student - s.provisional_grade = provisional_grade - end + assignment.moderated_grading_selections. + where(student_id: @student.id).first. + update_attribute(:provisional_grade, provisional_grade) assignment.update(grades_published_at: 1.hour.ago) submission.reload submission.attachments.first.create_crocodoc_document(uuid: '1234', @@ -4206,6 +4212,7 @@ describe 'Submissions API', type: :request do @student2 = student_in_course(:active_all => true).user @assignment = @course.assignments.build @assignment.moderated_grading = true + @assignment.grader_count = 1 @assignment.save! @assignment.submit_homework @student1, :body => 'EHLO' @path = "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/gradeable_students" @@ -4263,35 +4270,31 @@ describe 'Submissions API', type: :request do api_call_as_user(@ta, :get, @path, @params, {}, {}, { :expected_status => 401 }) end - context "when Anonymous Moderated Marking is enabled" do - before(:once) { @course.root_account.enable_feature!(:anonymous_moderated_marking) } + it "is unauthorized when the user is not the assigned final grader" do + api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 401) + end - it "is unauthorized when the user is not the assigned final grader" do - api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 401) - end + it "is unauthorized when the user is an account admin without 'Select Final Grade for Moderation' permission" do + @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) + api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 401) + end - it "is unauthorized when the user is an account admin without 'Select Final Grade for Moderation' permission" do - @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) - api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 401) - end + it "is authorized when the user is the final grader" do + @assignment.update!(final_grader: @teacher, grader_count: 2) + api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 200) + end - it "is authorized when the user is the final grader" do - @assignment.update!(final_grader: @teacher, grader_count: 2) - api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 200) - end - - it "is authorized when the user is an account admin with 'Select Final Grade for Moderation' permission" do - api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 200) - end + it "is authorized when the user is an account admin with 'Select Final Grade for Moderation' permission" do + api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 200) end it "includes provisional grades with selections" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) json = api_call_as_user(@teacher, :get, @path, @params) expect(json).to match_array( [{"id"=>@student1.id, @@ -4321,12 +4324,12 @@ describe 'Submissions API', type: :request do end it "anonymizes speedgrader_url if anonymously grading" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false json = api_call_as_user(@teacher, :get, @path, @params) anonymous_id = @assignment.submission_for_student(@student1).anonymous_id @@ -4339,12 +4342,12 @@ describe 'Submissions API', type: :request do end it "anonymizes scorer id of provisional grade if grading double blind" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false allow_any_instance_of(Assignment).to receive(:can_view_other_grader_identities?).and_return false json = api_call_as_user(@teacher, :get, @path, @params) @@ -4363,6 +4366,7 @@ describe 'Submissions API', type: :request do @student2 = student_in_course(:active_all => true).user @assignment1 = @course.assignments.build @assignment1.moderated_grading = true + @assignment1.grader_count = 1 @assignment1.save! @assignment2 = @course.assignments.build @assignment2.save! diff --git a/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js b/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js index 06c09c0c8fc..c77920fda2b 100644 --- a/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js +++ b/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js @@ -62,7 +62,7 @@ QUnit.module('GradebookHeaderMenu#hideMenuActionsWithUnmetDependencies', { submissions_downloads: 1 } this.gradebook = { - options: {anonymous_moderated_marking_enabled: false, gradebook_is_editable: true} + options: {gradebook_is_editable: true} } this.menuElement = document.createElement('ul') this.createMenu(this.menuElement) @@ -180,7 +180,7 @@ QUnit.module('GradebookHeaderMenu#disableUnavailableMenuActions', { this.createMenu(this.menuElement) this.menu = $(this.menuElement) this.gradebook = { - options: {anonymous_moderated_marking_enabled: false, gradebook_is_editable: true} + options: {gradebook_is_editable: true} } }, teardown() { @@ -242,28 +242,18 @@ test('does not disable "Set Default Grade" when isAdmin', function() { }) test('disables "Unmute Assignment" when the assignment is moderated and grades have not been published', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = true this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: true} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), 'true') }) -test('does not disable "Unmute Assignment" when Anonymous Moderated Marking is disabled', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = false - this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: true} - this.disableUnavailableMenuActions(this.menu) - strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) -}) - test('does not disable "Unmute Assignment" when grades are published', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = false this.assignment = {moderated_grading: true, grades_published: true, inClosedGradingPeriod: false, muted: true} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) }) -test('does not disable "Mute Assignment"', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = true +test('does not disable "Mute Assignment" when the assignment can be muted', function () { this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: false} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) diff --git a/spec/coffeescripts/gradebook/GradebookSpec.js b/spec/coffeescripts/gradebook/GradebookSpec.js index 5f6fa237849..6d0ae7a714a 100644 --- a/spec/coffeescripts/gradebook/GradebookSpec.js +++ b/spec/coffeescripts/gradebook/GradebookSpec.js @@ -943,43 +943,27 @@ QUnit.module('Gradebook#gotAllAssignmentGroups', suiteHooks => { $('#assignment_group_weights_dialog').remove() }) - QUnit.module('when Anonymous Moderated Marking is enabled', hooks => { - hooks.beforeEach(() => { - gradebook.options.anonymous_moderated_marking_enabled = true - }) + test('sets moderation_in_progress to true for a moderated assignment whose grades are not published', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, true) }) - test('sets moderation_in_progress to true for a moderated assignment whose grades are not published', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, true) }) - - test('sets moderation_in_progress to false for a moderated assignment whose grades are published', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedPublishedAssignment.moderation_in_progress, false) - }) - - test('sets moderation_in_progress to false for an unmoderated assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(unmoderatedAssignment.moderation_in_progress, false) - }) - - test('sets hide_grades_when_muted to true for an anonymous assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(anonymousUnmoderatedAssignment.hide_grades_when_muted, true) - }) - - test('sets hide_grades_when_muted to false for a non-anonymous assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(unmoderatedAssignment.hide_grades_when_muted, false) - }) + test('sets moderation_in_progress to false for a moderated assignment whose grades are published', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(moderatedPublishedAssignment.moderation_in_progress, false) }) - test('does not set moderation_in_progress when anonymous moderated marking is off', () => { + test('sets moderation_in_progress to false for an unmoderated assignment', () => { gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, undefined) + strictEqual(unmoderatedAssignment.moderation_in_progress, false) }) - test('does not set hide_grades_when_muted when anonymous moderated marking is off', () => { + test('sets hide_grades_when_muted to true for an anonymous assignment', () => { gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.hide_grades_when_muted, undefined) + strictEqual(anonymousUnmoderatedAssignment.hide_grades_when_muted, true) + }) + + test('sets hide_grades_when_muted to false for a non-anonymous assignment', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(unmoderatedAssignment.hide_grades_when_muted, false) }) }) diff --git a/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js b/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js index 7ada7230b3c..e8fbccba9d1 100644 --- a/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js +++ b/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js @@ -59,9 +59,7 @@ test('speed_grader_enabled sets speedgrader url', function() { equal(dialog.dialog.find('.more-details-link').length, 1) }) -test('speedGraderUrl excludes student id when Anonymous Moderated Marking is ' + -'enabled and the assignment is anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = true +test('speedGraderUrl excludes student id when assignment is anonymously graded', function() { this.assignment.anonymous_grading = true this.options.context_url = 'http://some-fake-url' const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) @@ -69,28 +67,7 @@ test('speedGraderUrl excludes student id when Anonymous Moderated Marking is ' + notOk(dialog.submission.speedGraderUrl.match(/student_id/)) }) -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'enabled and the assignment is not anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = true - this.options.context_url = 'http://some-fake-url' - const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) - - ok(dialog.submission.speedGraderUrl.match(/student_id/)) -}) - -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'disabled and the assignment is anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = false - this.assignment.anonymous_grading = true - this.options.context_url = 'http://some-fake-url' - const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) - - ok(dialog.submission.speedGraderUrl.match(/student_id/)) -}) - -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'disabled and the assignment is not anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = false +test('speedGraderUrl includes student id when assignment is not anonymously graded', function() { this.options.context_url = 'http://some-fake-url' const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) diff --git a/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js b/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js index 831f317ad13..441e79ef2c5 100644 --- a/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js +++ b/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js @@ -25,7 +25,6 @@ import Header from 'jsx/assignments/ModerationHeader' QUnit.module('ModerationHeader', { setup() { this.props = { - anonymousModeratedMarkingEnabled: false, muted: false, onPublishClick() {}, onReviewClick() {}, @@ -153,7 +152,6 @@ QUnit.module('ModerationHeader#unmuteAssignmentButton', (hooks) => { hooks.beforeEach(() => { props = { - anonymousModeratedMarkingEnabled: true, muted: true, onPublishClick() {}, onReviewClick() {}, @@ -179,18 +177,11 @@ QUnit.module('ModerationHeader#unmuteAssignmentButton', (hooks) => { wrapper.unmount() }) - test('renders the unmute button if Anonymous Moderated Marking is enabled', () => { + test('renders the unmute button', () => { renderHeader() strictEqual(wrapper.find(unmuteButtonSelector).exists(), true) }) - test('does not render the unmute button if Anonymous Moderated Marking is not enabled', () => { - props.anonymousModeratedMarkingEnabled = false - - renderHeader() - strictEqual(wrapper.find(unmuteButtonSelector).exists(), false) - }) - test('enables the unmute button if the assignment is published and muted', () => { props.published = true props.muted = true diff --git a/spec/coffeescripts/models/AssignmentSpec.js b/spec/coffeescripts/models/AssignmentSpec.js index b8a93b46d61..c0ec617f77e 100644 --- a/spec/coffeescripts/models/AssignmentSpec.js +++ b/spec/coffeescripts/models/AssignmentSpec.js @@ -1199,7 +1199,6 @@ QUnit.module('Assignment#renderModeratedGradingFormFieldGroup', (hooks) => { hooks.beforeEach(() => { fakeENV.setup({ - ANONYMOUS_MODERATED_MARKING_ENABLED: false, AVAILABLE_MODERATORS: availableModerators, HAS_GRADED_SUBMISSIONS: false, LOCALE: 'en', diff --git a/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js b/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js index dd3298e5238..16d3fd751fe 100644 --- a/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js +++ b/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js @@ -18,7 +18,6 @@ import fakeENV from 'helpers/fakeENV' import SpeedgraderHelpers, { - isAnonymousModeratedMarkingEnabled, setupIsAnonymous, setupAnonymizableId } from 'speed_grader_helpers' @@ -36,10 +35,6 @@ QUnit.module('SpeedGrader', { } }) -test('isAnonymousModeratedMarkingEnabled is available on main object', () => { - strictEqual(SpeedgraderHelpers.isAnonymousModeratedMarkingEnabled, isAnonymousModeratedMarkingEnabled) -}) - test('setupIsAnonymous is available on main object', () => { strictEqual(SpeedgraderHelpers.setupIsAnonymous, setupIsAnonymous) }) @@ -441,56 +436,18 @@ test('Posts to the resubmit URL', () => { $.ajaxJSON = previousAjaxJson }) -QUnit.module('SpeedgraderHelpers.isAnonymousModeratedMarking', suiteHooks => { - suiteHooks.afterEach(() => { - fakeENV.teardown() - }) - - test('returns false when not set', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(isAnonymousModeratedMarkingEnabled(), false) - }) - - test('returns false when disabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: false}) - strictEqual(isAnonymousModeratedMarkingEnabled(), false) - }) - - test('returns true when enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) - strictEqual(isAnonymousModeratedMarkingEnabled(), true) - }) -}) - QUnit.module('SpeedgraderHelpers.setupIsAnonymous', suiteHooks => { suiteHooks.afterEach(() => { fakeENV.teardown() }) - test('returns true when assignment is anonymously graded and Anonymous Moderated Marking is enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) + test('returns true when assignment is anonymously graded', () => { strictEqual(setupIsAnonymous({anonymous_grading: true}), true) }) - test('returns false when assignment is not anonymously graded and Anonymous Moderated Marking is enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) + test('returns false when assignment is not anonymously graded', () => { strictEqual(setupIsAnonymous({anonymous_grading: false}), false) }) - - test('returns false when assignment is anonymously graded and Anonymous Moderated Marking is disabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: false}) - strictEqual(setupIsAnonymous({anonymous_grading: true}), false) - }) - - test('returns false when assignment is not anonymously graded and Anonymous Moderated Marking is unset', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(setupIsAnonymous({anonymous_grading: false}), false) - }) - - test('returns false when assignment is anonymously graded and Anonymous Moderated Marking is unset', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(setupIsAnonymous({anonymous_grading: true}), false) - }) }) QUnit.module('SpeedgraderHelpers.setupAnonymizableId', suiteHooks => { diff --git a/spec/coffeescripts/views/assignments/EditViewSpec.js b/spec/coffeescripts/views/assignments/EditViewSpec.js index 9bf25fac397..d4253f907c1 100644 --- a/spec/coffeescripts/views/assignments/EditViewSpec.js +++ b/spec/coffeescripts/views/assignments/EditViewSpec.js @@ -149,16 +149,7 @@ test('rejects a letter for points_possible', function() { equal(errors.points_possible[0].message, 'Points possible must be a number') }) -test('does not validate presence of a final grader if anonymous moderated marking is disabled', function() { - const view = this.editView() - sinon.spy(view, 'validateFinalGrader') - view.validateBeforeSave({}, []) - strictEqual(view.validateFinalGrader.callCount, 0) - view.validateFinalGrader.restore() -}) - -test('validates presence of a final grader if anonymous moderated marking is enabled', function() { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true +test('validates presence of a final grader', function() { const view = this.editView() sinon.spy(view, 'validateFinalGrader') view.validateBeforeSave({}, []) @@ -166,16 +157,7 @@ test('validates presence of a final grader if anonymous moderated marking is ena view.validateFinalGrader.restore() }) -test('does not validate grader count if anonymous moderated marking is disabled', function() { - const view = this.editView() - sinon.spy(view, 'validateGraderCount') - view.validateBeforeSave({}, []) - strictEqual(view.validateGraderCount.callCount, 0) - view.validateGraderCount.restore() -}) - -test('validates grader count if anonymous moderated marking is enabled', function() { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true +test('validates grader count', function() { const view = this.editView() sinon.spy(view, 'validateGraderCount') view.validateBeforeSave({}, []) @@ -355,22 +337,6 @@ test('renders escaped angle brackets properly', function() { equal(view.$description.val().match(desc), desc) }) -test('allows changing moderation setting if no graded submissions exist', function() { - ENV.HAS_GRADED_SUBMISSIONS = false - const view = this.editView({has_submitted_submissions: true, moderated_grading: true}) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('checked')) - notOk(view.$('[type=checkbox][name=moderated_grading]').prop('disabled')) - equal(view.$('[type=hidden][name=moderated_grading]').attr('value'), '0') -}) - -test('locks down moderation setting after students submit', function() { - ENV.HAS_GRADED_SUBMISSIONS = true - const view = this.editView({has_submitted_submissions: true, moderated_grading: true}) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('checked')) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('disabled')) - equal(view.$('[type=hidden][name=moderated_grading]').attr('value'), '1') -}) - test('routes to discussion details normally', function() { const view = this.editView({html_url: 'http://foo'}) equal(view.locationAfterSave({}), 'http://foo') @@ -1014,18 +980,11 @@ QUnit.module('EditView: Anonymous Moderated Marking', (hooks) => { fixtures.innerHTML = '' }) - test('adds the ModeratedGradingFormFieldGroup mount point when anonymous moderated marking is on', () => { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true + test('adds the ModeratedGradingFormFieldGroup mount point', () => { const view = editView() view.toJSON() strictEqual(view.$el.find('[data-component="ModeratedGradingFormFieldGroup"]').length, 1) }) - - test('does not add the ModeratedGradingFormFieldGroup mount point when anonymous moderated marking is off', () => { - const view = editView() - view.toJSON() - strictEqual(view.$el.find('[data-component="ModeratedGradingFormFieldGroup"]').length, 0) - }) }) QUnit.module('EditView#validateFinalGrader', (hooks) => { diff --git a/spec/controllers/anonymous_submissions_controller_spec.rb b/spec/controllers/anonymous_submissions_controller_spec.rb index c91d942f268..f78c2f29f82 100644 --- a/spec/controllers/anonymous_submissions_controller_spec.rb +++ b/spec/controllers/anonymous_submissions_controller_spec.rb @@ -25,7 +25,6 @@ RSpec.describe AnonymousSubmissionsController do before do course_with_student_and_submitted_homework @context = @course - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(anonymous_grading: true) @submission.update!(score: 10) @assignment.unmute! diff --git a/spec/controllers/assignments_controller_spec.rb b/spec/controllers/assignments_controller_spec.rb index 0e331462128..8d18605e111 100644 --- a/spec/controllers/assignments_controller_spec.rb +++ b/spec/controllers/assignments_controller_spec.rb @@ -218,7 +218,7 @@ describe AssignmentsController do end describe "per-assignment permissions" do - let(:js_permissions) { assigns[:js_env][:PERMISSIONS] } + let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } before(:each) do @course.enable_feature!(:moderated_grading) @@ -230,39 +230,23 @@ describe AssignmentsController do ) user_session(@teacher) + ta_in_course(active_all: true) + + @noneditable_assignment = @course.assignments.create!( + moderated_grading: true, + grader_count: 2, + final_grader: @ta + ) end - context "when Anonymous Moderated Marking is on" do - let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } - - before(:once) do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - - ta_in_course(active_all: true) - - @noneditable_assignment = @course.assignments.create!( - moderated_grading: true, - grader_count: 2, - final_grader: @ta - ) - end - - it "sets the 'update' attribute for an editable assignment to true" do - get 'index', params: {course_id: @course.id} - expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) - end - - it "sets the 'update' attribute for a non-editable assignment to false" do - get 'index', params: {course_id: @course.id} - expect(assignment_permissions[@noneditable_assignment.id][:update]).to eq(false) - end + it "sets the 'update' attribute for an editable assignment to true" do + get 'index', params: {course_id: @course.id} + expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) end - context "when Anonymous Moderated Marking is off" do - it "does not set permissions in js_env for individual assignments" do - get 'index', params: {course_id: @course.id} - expect(js_permissions).not_to include(:by_assignment_id) - end + it "sets the 'update' attribute for a non-editable assignment to false" do + get 'index', params: {course_id: @course.id} + expect(assignment_permissions[@noneditable_assignment.id][:update]).to eq(false) end end end @@ -270,202 +254,115 @@ describe AssignmentsController do describe "GET 'show_moderate'" do before(:each) do user_session(@teacher) - end - - let(:assignment) do - @course.assignments.create( - title: 'some assignment', - workflow_state: 'published', - moderated_grading: true + course_with_user('TeacherEnrollment', {active_all: true, course: @course}) + @other_teacher = @user + @assignment = @course.assignments.create!( + moderated_grading: true, + final_grader: @other_teacher, + grader_count: 2, + workflow_state: 'published' ) end - describe 'js_env for URLS' do - let(:urls) { assigns[:js_env][:URLS] } - - it 'sets student_submissions_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:student_submissions_url]).to eq "http://test.host/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/submissions?include[]=user_summary&include[]=provisional_grades" - end - - it 'sets provisional_grades_base_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:provisional_grades_base_url]).to eq "http://test.host/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/provisional_grades" - end - - it 'sets unmute_assignment_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:unmute_assignment_url]).to eq "http://test.host/courses/#{@course.id}/assignments/#{assignment.id}/mute?status=false" - end + it "renders the page when the current user is the selected moderator" do + user_session(@other_teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) end - it "sets the js_env for ASSIGNMENT_TITLE" do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(assigns[:js_env][:ASSIGNMENT_TITLE]).to eq "some assignment" + it "renders unauthorized when the current user is not the selected moderator" do + user_session(@teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_unauthorized end - describe 'permissions' do - before(:once) do - @user = User.create! - @custom_role = @course.root_account.roles.create!(name: 'CustomRole', base_role_type: 'TaEnrollment') - @course.root_account.role_overrides.create!(permission: :moderate_grades, role: @custom_role, enabled: true) - @course.root_account.role_overrides.create!(permission: :view_all_grades, role: @custom_role, enabled: false) - @course.root_account.role_overrides.create!(permission: :manage_grades, role: @custom_role, enabled: false) - @course.enroll_user(@user, 'TaEnrollment', role: @custom_role, active_all: true) - @assignment = @course.assignments.create!(workflow_state: 'published', moderated_grading: true) - end - - before(:each) { user_session(@user) } - let(:permissions) { assigns[:js_env][:PERMISSIONS] } - - let(:allow_editing) do - override = @course.root_account.role_overrides.find_by(permission: 'manage_grades') - override.update!(enabled: true) - end - - let(:allow_viewing) do - override = @course.root_account.role_overrides.find_by(permission: 'view_all_grades') - override.update!(enabled: true) - end - - it 'grants the user view permissions if they have "View all grades" permissions in the course' do - allow_viewing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq true - end - - it 'grants the user view permissions if they have "Edit grades" permissions in the course' do - allow_editing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq true - end - - it 'denies the user view permissions if they lack both "View all grades" and "Edit grades" \ - permissions in the course' do - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq false - end - - it 'grants the user edit permissions if they have "Edit grades" permissions in the course' do - allow_editing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:edit_grades]).to eq true - end - - it 'denies the user edit permissions if they lack "Edit grades" permissions in the course' do - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:edit_grades]).to eq false - end + it "renders unauthorized when no moderator is selected and the user is not an admin" do + @assignment.update!(final_grader: nil) + user_session(@teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(401) end - context "when Anonymous Moderated Grading is enabled" do - before :once do - @course.root_account.enable_feature!(:anonymous_moderated_marking) + it "renders unauthorized when no moderator is selected and the user is an admin without " \ + "'Select Final Grade for Moderation' permission" do + @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) + @assignment.update!(final_grader: nil) + user_session(account_admin_user) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(401) + end + + it "renders the page when the current user is an admin and not the selected moderator" do + account_admin_user(account: @course.root_account) + user_session(@admin) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) + end + + it "renders the page when no moderator is selected and the user is an admin with " \ + "'Select Final Grade for Moderation' permission" do + @assignment.update!(final_grader: nil) + user_session(account_admin_user) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) + end + + describe "js_env" do + let_once(:grader_1) do course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @other_teacher = @user - @assignment = @course.assignments.create!( + @user + end + let_once(:grader_2) do + course_with_user('TeacherEnrollment', {active_all: true, course: @course}) + @user + end + + let(:env) { assigns[:js_env] } + + before :once do + @assignment.moderation_graders.create!(anonymous_id: "abcde", user: grader_1) + @assignment.moderation_graders.create!(anonymous_id: "fghij", user: grader_2) + end + + before :each do + @assignment.update_attributes( moderated_grading: true, final_grader: @other_teacher, - grader_count: 2, - workflow_state: 'published' + grader_count: 2 ) - end - - it "renders the page when the current user is the selected moderator" do user_session(@other_teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) end - it "renders unauthorized when the current user is not the selected moderator" do - user_session(@teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_unauthorized + it "includes ASSIGNMENT.course_id" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:course_id]).to be(@course.id) end - it "renders unauthorized when no moderator is selected and the user is not an admin" do - @assignment.update!(final_grader: nil) - user_session(@teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(401) + it "includes ASSIGNMENT.id" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:id]).to be(@assignment.id) end - it "renders unauthorized when no moderator is selected and the user is an admin without " \ - "'Select Final Grade for Moderation' permission" do - @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) - @assignment.update!(final_grader: nil) - user_session(account_admin_user) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(401) + it "includes ASSIGNMENT.grades_published" do + @assignment.update!(grades_published_at: 1.day.ago) + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:grades_published]).to be(true) end - it "renders the page when the current user is an admin and not the selected moderator" do - account_admin_user(account: @course.root_account) - user_session(@admin) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) + it "includes ASSIGNMENT.muted" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:muted]).to be(true) end - it "renders the page when no moderator is selected and the user is an admin with " \ - "'Select Final Grade for Moderation' permission" do - @assignment.update!(final_grader: nil) - user_session(account_admin_user) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) + it "includes ASSIGNMENT.title" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:title]).to eql(@assignment.title) end - describe "js_env" do - let_once(:grader_1) do - course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @user - end - let_once(:grader_2) do - course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @user - end - - let(:env) { assigns[:js_env] } - - before :once do - @assignment.moderation_graders.create!(anonymous_id: "abcde", user: grader_1) - @assignment.moderation_graders.create!(anonymous_id: "fghij", user: grader_2) - end - - before :each do - user_session(@other_teacher) - end - - it "includes ASSIGNMENT.course_id" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:course_id]).to be(@course.id) - end - - it "includes ASSIGNMENT.id" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:id]).to be(@assignment.id) - end - - it "includes ASSIGNMENT.grades_published" do - @assignment.update!(grades_published_at: 1.day.ago) - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:grades_published]).to be(true) - end - - it "includes ASSIGNMENT.muted" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:muted]).to be(true) - end - - it "includes ASSIGNMENT.title" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:title]).to eql(@assignment.title) - end - - it "includes moderation graders in GRADERS" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - moderation_grader_ids = @assignment.moderation_graders.map(&:id) - expect(env[:GRADERS].map {|grader| grader[:id]}).to match_array(moderation_grader_ids) - end + it "includes moderation graders in GRADERS" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + moderation_grader_ids = @assignment.moderation_graders.map(&:id) + expect(env[:GRADERS].map {|grader| grader[:id]}).to match_array(moderation_grader_ids) end end end @@ -719,18 +616,17 @@ describe AssignmentsController do user_session(@teacher) end - context "with anonymous moderated marking enabled and moderated grading on" do + context "with moderated grading on" do before :each do - @course.account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(moderated_grading: true, grader_count: 1) end - it "should fail if anonymous_moderated_marking is enabled, grades are not published, and status is false" do + it "should fail if grades are not published, and status is false" do put 'toggle_mute', params: { course_id: @course.id, assignment_id: @assignment.id, status: false }, format: 'json' assert_unauthorized end - it "should mute if anonymous_moderated_marking is enabled, grades are not published, and status is true" do + it "should mute if grades are not published, and status is true" do @assignment.update!(muted: false) put 'toggle_mute', params: { course_id: @course.id, assignment_id: @assignment.id, status: true }, format: 'json' @assignment.reload @@ -893,7 +789,7 @@ describe AssignmentsController do let(:request_params) { [:edit, params: {course_id: course, id: @assignment}] } end - shared_examples 'course feature flag made available by Anonymous Moderated Marking account flag' do + shared_examples 'course feature flags for Anonymous Moderated Marking' do before(:each) do user_session(@teacher) end @@ -904,30 +800,11 @@ describe AssignmentsController do expect(assigns[:js_env][js_env_attribute]).to be false end - it 'is false when the feature flag is enabled' do + it 'is true when the feature flag is enabled' do @course.enable_feature!(feature_flag) get 'edit', params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][js_env_attribute]).to be false - end - - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - @course.account.enable_feature!(:anonymous_moderated_marking) - end - - it 'is false when the feature flag is not enabled' do - get 'edit', params: { course_id: @course.id, id: @assignment.id } - - expect(assigns[:js_env][js_env_attribute]).to be false - end - - it 'is true when the feature flag is enabled' do - @course.enable_feature!(feature_flag) - get 'edit', params: { course_id: @course.id, id: @assignment.id } - - expect(assigns[:js_env][js_env_attribute]).to be true - end + expect(assigns[:js_env][js_env_attribute]).to be true end end @@ -983,26 +860,8 @@ describe AssignmentsController do expect(assigns[:js_env][:SIS_NAME]).to eq('Foo Bar') end - describe 'js_env ANONYMOUS_MODERATED_MARKING_ENABLED' do - before(:each) do - user_session(@teacher) - end - - it 'is true when the root account has Anonymous Moderated Marking enabled' do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :edit, params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][:ANONYMOUS_MODERATED_MARKING_ENABLED]).to be true - end - - it 'is false when the root account does not have Anonymous Moderated Marking enabled' do - get :edit, params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][:ANONYMOUS_MODERATED_MARKING_ENABLED]).to be false - end - end - it 'js_env AVAILABLE_MODERATORS includes the name and id for each available moderator' do user_session(@teacher) - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(grader_count: 2, moderated_grading: true) get :edit, params: { course_id: @course.id, id: @assignment.id } expected_moderators = @course.instructors.map { |user| { name: user.name, id: user.id } } @@ -1111,14 +970,14 @@ describe AssignmentsController do end describe 'js_env ANONYMOUS_GRADING_ENABLED' do - it_behaves_like 'course feature flag made available by Anonymous Moderated Marking account flag' do + it_behaves_like 'course feature flags for Anonymous Moderated Marking' do let(:js_env_attribute) { :ANONYMOUS_GRADING_ENABLED } let(:feature_flag) { :anonymous_marking } end end describe 'js_env MODERATED_GRADING_ENABLED' do - it_behaves_like 'course feature flag made available by Anonymous Moderated Marking account flag' do + it_behaves_like 'course feature flags for Anonymous Moderated Marking' do let(:js_env_attribute) { :MODERATED_GRADING_ENABLED } let(:feature_flag) { :moderated_grading } end diff --git a/spec/controllers/canvadoc_sessions_controller_spec.rb b/spec/controllers/canvadoc_sessions_controller_spec.rb index cf1fbd4659e..8ef1bb800b1 100644 --- a/spec/controllers/canvadoc_sessions_controller_spec.rb +++ b/spec/controllers/canvadoc_sessions_controller_spec.rb @@ -203,9 +203,7 @@ describe CanvadocSessionsController do end let(:hmac) { Canvas::Security.hmac_sha1(blob.to_json) } - it "disables submission annotations for an anonymously-graded assignment " \ - "when Anonymous Moderated Marking is enabled" do - @course.root_account.enable_feature!(:anonymous_moderated_marking) + it "disables submission annotations for an anonymously-graded assignment" do @assignment.update!(anonymous_grading: true) # The controller fetches different instances of the model objects we're # working with here, so unfortunately we can't mock them specifically. @@ -215,9 +213,8 @@ describe CanvadocSessionsController do get :show, params: {blob: blob.to_json, hmac: hmac} end - it "enables submission annotations for an anonymously-graded assignment " \ - "when Anonymous Moderated Marking is disabled" do - @assignment.update!(anonymous_grading: true) + it "enables submission annotations for a non-anonymously-graded assignment" do + @assignment.update!(anonymous_grading: false) # The controller fetches different instances of the model objects we're # working with here, so unfortunately we can't mock them specifically. expect_any_instance_of(Canvadoc).to receive(:session_url). diff --git a/spec/controllers/courses_controller_spec.rb b/spec/controllers/courses_controller_spec.rb index 378a6f5105f..e1ca5300398 100644 --- a/spec/controllers/courses_controller_spec.rb +++ b/spec/controllers/courses_controller_spec.rb @@ -488,38 +488,25 @@ describe CoursesController do grader_count: 2, final_grader: @teacher ) + + ta_in_course(active_all: true) + @uneditable_assignment = @course.assignments.create!( + moderated_grading: true, + grader_count: 2, + final_grader: @ta + ) end - context "when Anonymous Moderated Marking is on" do - let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } + let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } - before(:each) do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - - ta_in_course(active_all: true) - @uneditable_assignment = @course.assignments.create!( - moderated_grading: true, - grader_count: 2, - final_grader: @ta - ) - end - - it "sets the 'update' attribute for an editable assignment to true" do - get 'show', params: {id: @course.id} - expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) - end - - it "sets the 'update' attribute for an uneditable assignment to false" do - get 'show', params: {id: @course.id} - expect(assignment_permissions[@uneditable_assignment.id][:update]).to eq(false) - end + it "sets the 'update' attribute for an editable assignment to true" do + get 'show', params: {id: @course.id} + expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) end - context "when Anonymous Moderated Marking is off" do - it "does not set permissions in js_env for individual assignments" do - get 'show', params: {id: @course.id} - expect(js_permissions).not_to include(:by_assignment_id) - end + it "sets the 'update' attribute for an uneditable assignment to false" do + get 'show', params: {id: @course.id} + expect(assignment_permissions[@uneditable_assignment.id][:update]).to eq(false) end end end @@ -2378,11 +2365,11 @@ describe CoursesController do user_session(@teacher) post 'student_view', params: {course_id: @course.id} test_student = @course.student_view_student - assignment = @course.assignments.create!(:workflow_state => 'published', :moderated_grading => true) + assignment = @course.assignments.create!(workflow_state: 'published', moderated_grading: true, grader_count: 2) assignment.grade_student test_student, { :grade => 1, :grader => @teacher, :provisional => true } file = assignment.attachments.create! uploaded_data: default_uploaded_data assignment.submissions.first.add_comment(commenter: @teacher, message: 'blah', provisional: true, attachments: [file]) - assignment.moderated_grading_selections.create!(:student => test_student, :provisional_grade => ModeratedGrading::ProvisionalGrade.last) + assignment.moderated_grading_selections.where(student: test_student).first.update_attribute(:provisional_grade, ModeratedGrading::ProvisionalGrade.last) expect(test_student.submissions.size).not_to be_zero delete 'reset_test_student', params: {course_id: @course.id} diff --git a/spec/controllers/gradebooks_controller_spec.rb b/spec/controllers/gradebooks_controller_spec.rb index 697261e037f..fab92c1f2b9 100644 --- a/spec/controllers/gradebooks_controller_spec.rb +++ b/spec/controllers/gradebooks_controller_spec.rb @@ -741,19 +741,6 @@ describe GradebooksController do end end - it "includes anonymous_moderated_marking_enabled for Old Gradebook" do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :show, params: { course_id: @course.id } - expect(gradebook_options.fetch(:anonymous_moderated_marking_enabled)).to eq(true) - end - - it "includes anonymous_moderated_marking_enabled for New Gradebook" do - @course.enable_feature!(:new_gradebook) - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :show, params: { course_id: @course.id } - expect(gradebook_options.fetch(:anonymous_moderated_marking_enabled)).to eq(true) - end - it "includes colors if New Gradebook is enabled" do @course.enable_feature!(:new_gradebook) get :show, params: {course_id: @course.id} @@ -1285,10 +1272,6 @@ describe GradebooksController do end describe 'anonymous assignment' do - before :once do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - end - it 'works with the absense of user_id and the presence of anonymous_id' do user_session(@teacher) @assignment.update!(anonymous_grading: true) @@ -1413,7 +1396,7 @@ describe GradebooksController do context "moderated grading" do before :once do - @assignment = @course.assignments.create!(:title => "some assignment", :moderated_grading => true) + @assignment = @course.assignments.create!(title: "some assignment", moderated_grading: true, grader_count: 1) @student = @course.enroll_student(User.create!(:name => "some user"), :enrollment_state => :active).user end @@ -1483,16 +1466,16 @@ describe GradebooksController do expect(pg.graded_anonymously).to eq false end - it "doesn't create a provisional grade when the student has one already (and isn't in the moderation set)" do - submission = @assignment.submit_homework(@student, :body => "hello") + it "doesn't create a provisional grade when the student has one already" do + @assignment.submit_homework(@student, :body => "hello") other_teacher = teacher_in_course(:course => @course, :active_all => true).user - submission.find_or_create_provisional_grade!(other_teacher) + @assignment.grade_student(@student, grade: 2, grader: other_teacher, provisional: true) post 'update_submission', params: {:course_id => @course.id, :submission => { :score => 100, :comment => "provisional!", :assignment_id => @assignment.id, :user_id => @student.id, :provisional => true }}, :format => :json expect(response).to_not be_success - expect(response.body).to include("Student already has the maximum number of provisional grades") + expect(response.body).to include("The maximum number of graders has been reached for this assignment") end it "should create a provisional grade even if the student has one but is in the moderation set" do @@ -1500,8 +1483,6 @@ describe GradebooksController do other_teacher = teacher_in_course(:course => @course, :active_all => true).user submission.find_or_create_provisional_grade!(other_teacher) - @assignment.moderated_grading_selections.create!(:student => @student) - post 'update_submission', params: {:course_id => @course.id, :submission => { :score => 100, :comment => "provisional!", :assignment_id => @assignment.id, :user_id => @student.id, :provisional => true }}, :format => :json @@ -1547,11 +1528,10 @@ describe GradebooksController do end end - describe 'provisional grade error handling for Anonymous Moderated Marking' do + describe 'provisional grade error handling' do before(:once) do course_with_student(active_all: true) teacher_in_course(active_all: true) - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment = @course.assignments.create!( title: 'yet another assignment', @@ -1653,20 +1633,14 @@ describe GradebooksController do expect(assigns[:disable_unmute_assignment]).to eq false end - it 'sets disable_unmute_assignment to false if anonymous moderated marking is disabled' do - get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} - expect(assigns[:disable_unmute_assignment]).to eq false - end - it 'sets disable_unmute_assignment to false if assignment grades have been published' do @assignment.update!(grades_published_at: Time.zone.now) get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} expect(assigns[:disable_unmute_assignment]).to eq false end - it 'sets disable_unmute_assignment to true if assignment muted, anonymous moderated marking enabled, and grades not published' do + it 'sets disable_unmute_assignment to true if assignment muted and grades not published' do @assignment.update!(muted: true, grades_published_at: nil, moderated_grading: true, grader_count: 1) - @assignment.root_account.enable_feature!(:anonymous_moderated_marking) get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} expect(assigns[:disable_unmute_assignment]).to eq true end diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb index f957b573e7b..e32794fa346 100644 --- a/spec/controllers/submissions_controller_spec.rb +++ b/spec/controllers/submissions_controller_spec.rb @@ -543,47 +543,41 @@ describe SubmissionsController do expect(body['published_score']).to be nil end - context "for an assignment that has anonymous grading and muted with anonymous_moderated_marking enabled" do - before :each do - @assignment.root_account.enable_feature!(:anonymous_moderated_marking) - end + it "renders the page for submitting student" do + user_session(@student) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_status(200) + end - it "renders the page for submitting student" do - user_session(@student) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_status(200) - end + it "renders unauthorized for non-submitting student" do + new_student = User.create! + @context.enroll_student(new_student, enrollment_state: 'active') + user_session(new_student) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for non-submitting student" do - new_student = User.create! - @context.enroll_student(new_student, enrollment_state: 'active') - user_session(new_student) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end + it "renders unauthorized for teacher" do + user_session(@teacher) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for teacher" do - user_session(@teacher) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end + it "renders unauthorized for admin" do + user_session(account_admin_user) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for admin" do - user_session(account_admin_user) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end - - it "renders the page for site admin" do - user_session(site_admin_user) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_status(200) - end + it "renders the page for site admin" do + user_session(site_admin_user) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_status(200) end context "with user id not present in course" do diff --git a/spec/helpers/gradebooks_helper_spec.rb b/spec/helpers/gradebooks_helper_spec.rb index fcd7f486030..7483760a490 100644 --- a/spec/helpers/gradebooks_helper_spec.rb +++ b/spec/helpers/gradebooks_helper_spec.rb @@ -56,44 +56,6 @@ describe GradebooksHelper do end end - describe '#anonymous_grading_required?' do - it 'returns false by default' do - assignment = assignment_model - expect(helper.anonymous_grading_required?(assignment)).to eq false - end - - it 'returns true if course setting is on' do - assignment = assignment_model - assignment.context.enable_feature!(:anonymous_grading) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if sub-account setting is on' do - root_account = Account.default - sub_account = root_account.sub_accounts.create! - sub_account.enable_feature!(:anonymous_grading) - sub_account_course = course_model(account: sub_account) - assignment = assignment_model(course: sub_account_course) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if root account setting is on' do - root_account = Account.default - root_account.enable_feature!(:anonymous_grading) - sub_account = root_account.sub_accounts.create! - sub_account_course = course_model(account: sub_account) - assignment = assignment_model(course: sub_account_course) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if site admin setting is on' do - site_admin_account = Account.site_admin - site_admin_account.enable_feature!(:anonymous_grading) - assignment = assignment_model - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - end - describe '#force_anonymous_grading?' do it 'returns false by default' do expect(helper.force_anonymous_grading?(assignment_model)).to eq false @@ -104,26 +66,15 @@ describe GradebooksHelper do expect(helper.force_anonymous_grading?(assignment)).to eq true end - it 'returns true if anonymous grading flag set' do - Account.default.enable_feature!(:anonymous_grading) - expect(helper.force_anonymous_grading?(assignment_model)).to eq true + it 'returns true for an anonymously-graded assignment' do + assignment = assignment_model + assignment.anonymous_grading = true + expect(helper.force_anonymous_grading?(assignment)).to eq true end - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - Account.default.enable_feature!(:anonymous_moderated_marking) - end - - it 'returns true for an anonymously-graded assignment' do - assignment = assignment_model - assignment.anonymous_grading = true - expect(helper.force_anonymous_grading?(assignment)).to eq true - end - - it 'returns false for a non-anonymously-graded assignment' do - assignment = assignment_model - expect(helper.force_anonymous_grading?(assignment)).to eq false - end + it 'returns false for a non-anonymously-graded assignment' do + assignment = assignment_model + expect(helper.force_anonymous_grading?(assignment)).to eq false end end @@ -138,8 +89,9 @@ describe GradebooksHelper do end it 'returns anonymous grading' do - Account.default.enable_feature!(:anonymous_grading) - expect(helper.force_anonymous_grading_reason(assignment_model)).to match(/anonymous grading/) + assignment = assignment_model + assignment.anonymous_grading = true + expect(helper.force_anonymous_grading_reason(assignment)).to match(/anonymous grading/) end end diff --git a/spec/integration/assignments_spec.rb b/spec/integration/assignments_spec.rb index c76a8a40b06..d71843e8bc5 100644 --- a/spec/integration/assignments_spec.rb +++ b/spec/integration/assignments_spec.rb @@ -309,7 +309,7 @@ describe "ratio of submissions graded" do let(:moderate_button) { Nokogiri::HTML(response.body).at_css('#moderated_grading_button') } it 'shows the moderation link for moderated assignments' do - @assignment.update!(moderated_grading: true) + @assignment.update!(moderated_grading: true, grader_count: 1, final_grader: @teacher) get "/courses/#{@course.id}/assignments/#{@assignment.id}" expect(moderate_button).not_to be_nil diff --git a/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js b/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js index 34bdd3ab667..ffe4a21f4df 100644 --- a/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js +++ b/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js @@ -50,25 +50,25 @@ define([ // time this is being written a significant amount of work is needed // to be able to require javascript files that live in the spec directory - QUnit.module('SubmissionStateMap with anonymous moderated marking enabled'); + QUnit.module('SubmissionStateMap'); test ('submission has grade visible if not anonymous', function() { const assignment = { id: '1', muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, false); }); test ('submission has grade visible if not muted', function() { const assignment = { id: '1', anonymous_grading: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, false); }); test ('submission has grade hidden if anonymous and muted', function() { const assignment = { id: '1', anonymous_grading: true, muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, true); }); diff --git a/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js b/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js index bbf0f3433b5..f4b84c91bdd 100644 --- a/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js +++ b/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js @@ -50,25 +50,25 @@ define([ // time this is being written a significant amount of work is needed // to be able to require javascript files that live in the spec directory - QUnit.module('SubmissionStateMap with anonymous moderated marking enabled'); + QUnit.module('SubmissionStateMap'); test ('submission is unlocked if not anonymous', function() { const assignment = { id: '1', muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, false); }); test ('submission is unlocked if not muted', function() { const assignment = { id: '1', anonymous_grading: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, false); }); test ('submission is locked if anonymous and muted', function() { const assignment = { id: '1', anonymous_grading: true, muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, true); }); diff --git a/spec/javascripts/jsx/gradezilla/GradebookSpec.js b/spec/javascripts/jsx/gradezilla/GradebookSpec.js index ac2e1388ed2..eb774097bce 100644 --- a/spec/javascripts/jsx/gradezilla/GradebookSpec.js +++ b/spec/javascripts/jsx/gradezilla/GradebookSpec.js @@ -6198,18 +6198,6 @@ test('sets the submission state map .isAdmin when the current user roles do not strictEqual(gradebook.submissionStateMap.isAdmin, false); }); -test('sets submission state map .anonymousModeratedMarkingEnabled when anonymous moderated marking flag is set', function () { - const gradebook = createGradebook({ anonymous_moderated_marking_enabled: true }); - gradebook.initSubmissionStateMap(); - strictEqual(gradebook.submissionStateMap.anonymousModeratedMarkingEnabled, true); -}); - -test('sets submission state map .anonymousModeratedMarkingEnabled to false when anonymous moderated marking flag is reset', function () { - const gradebook = createGradebook({ anonymous_moderated_marking_enabled: false }); - gradebook.initSubmissionStateMap(); - strictEqual(gradebook.submissionStateMap.anonymousModeratedMarkingEnabled, false); -}); - QUnit.module('Gradebook#initPostGradesLtis'); test('sets postGradesLtis as an array', function () { @@ -6973,19 +6961,6 @@ QUnit.module('Gradebook#getSubmissionTrayProps', function(suiteHooks) { moxios.uninstall(); }); - test('anonymousModeratedMarkingEnabled is true when options.anonymous_moderated_marking_enabled is true', function () { - gradebook.options.anonymous_moderated_marking_enabled = true - gradebook.setSubmissionTrayState(true, '1101', '2301'); - const props = gradebook.getSubmissionTrayProps(gradebook.student('1101')); - strictEqual(props.anonymousModeratedMarkingEnabled, true); - }); - - test('anonymousModeratedMarkingEnabled is false when options.anonymous_moderated_marking_enabled is false', function () { - gradebook.setSubmissionTrayState(true, '1101', '2301'); - const props = gradebook.getSubmissionTrayProps(gradebook.student('1101')); - strictEqual(props.anonymousModeratedMarkingEnabled, false); - }); - test('gradingDisabled is true when the submission state is locked', function () { sinon.stub(gradebook.submissionStateMap, 'getSubmissionState').returns({ locked: true }); gradebook.setSubmissionTrayState(true, '1101', '2301'); diff --git a/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js b/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js index 60f898c7bd9..c40f535d578 100644 --- a/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js +++ b/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js @@ -39,8 +39,7 @@ function createMap (opts = {}) { const defaults = { hasGradingPeriods: false, selectedGradingPeriodID: '0', - isAdmin: false, - anonymousModeratedMarkingEnabled: false + isAdmin: false }; const params = { ...defaults, ...opts }; @@ -122,123 +121,121 @@ QUnit.module('#setSubmissionCellState', function() { strictEqual(submission.hideGrade, false); }); - QUnit.module('anonymous moderated marking enabled', function() { - test('the submission state is locked when the student is not assigned', function() { - const assignment = { - id: '1', - published: true, - only_visible_to_overrides: true, - assignment_visibility: ['2'] - } - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) + test('the submission state is locked when the student is not assigned', function() { + const assignment = { + id: '1', + published: true, + only_visible_to_overrides: true, + assignment_visibility: ['2'] + } + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.locked, true) + }) + + test('the submission state is not locked if not moderated grading', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, false); + }); + + test('the submission state has hideGrade not set if not moderated grading', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + test('the submission state is not locked if moderated grading and grades published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: true + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, false); + }); + + test('the submission state has hideGrade not set if moderated grading and grades published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: true + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + test('the submission state is locked if moderated grading and grades not published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, true); + }); + + test('the submission state has hideGrade not set if moderated grading and grades not published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + QUnit.module('when the assignment is anonymous', function(hooks) { + let assignment + + hooks.beforeEach(() => { + assignment = { id: '1', published: true, anonymous_grading: true } + }) + + test('the submission state is locked when the assignment is muted', function() { + assignment.muted = true + const map = createAndSetupMap(assignment, studentWithSubmission) const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) strictEqual(submission.locked, true) }) - test('the submission state is not locked if not moderated grading', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, false); - }); - - test('the submission state has hideGrade not set if not moderated grading', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - test('the submission state is not locked if moderated grading and grades published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: true - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, false); - }); - - test('the submission state has hideGrade not set if moderated grading and grades published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: true - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - test('the submission state is locked if moderated grading and grades not published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, true); - }); - - test('the submission state has hideGrade not set if moderated grading and grades not published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - QUnit.module('when the assignment is anonymous', function(hooks) { - let assignment - - hooks.beforeEach(() => { - assignment = { id: '1', published: true, anonymous_grading: true } - }) - - test('the submission state is locked when the assignment is muted', function() { - assignment.muted = true - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.locked, true) - }) - - test('the submission state is hidden when the assignment is muted', function() { - assignment.muted = true - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.hideGrade, true) - }) - - test('the submission state is unlocked when the assignment is unmuted', function() { - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.locked, false) - }) - - test('the submission state is not hidden when the assignment is unmuted', function() { - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.hideGrade, false) - }) + test('the submission state is hidden when the assignment is muted', function() { + assignment.muted = true + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.hideGrade, true) }) - }); + + test('the submission state is unlocked when the assignment is unmuted', function() { + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.locked, false) + }) + + test('the submission state is not hidden when the assignment is unmuted', function() { + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.hideGrade, false) + }) + }) QUnit.module('no submission', function() { test('the submission object is missing if the assignment is late', function () { diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js index 31c6e74ea0e..b147d0f84b0 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js @@ -173,11 +173,10 @@ QUnit.module('AssignmentColumnHeaderRenderer', function (suiteHooks) { equal(component.props.downloadSubmissionsAction, gradebook.getDownloadSubmissionsAction.returnValues[0]); }); - test('the anonymousGrading prop is `false` when the assignment is anonymous', function () { + test('the anonymousGrading prop is `true` when the assignment is anonymous', function () { assignment.anonymous_grading = true render() - // anonymousGrading can only be true if Anonymous Moderated Marking is enabled - strictEqual(component.props.assignment.anonymousGrading, false) + strictEqual(component.props.assignment.anonymousGrading, true) }) test('the anonymousGrading prop is `false` when the assignment is not anonymous', function () { @@ -505,23 +504,6 @@ QUnit.module('AssignmentColumnHeaderRenderer', function (suiteHooks) { render(); equal(component.props.sortBySetting.settingKey, 'grade'); }); - - QUnit.module('when Anonymous Moderated Marking is enabled', function (hooks) { - hooks.beforeEach(() => { - gradebook.options.anonymous_moderated_marking_enabled = true - }) - - test('the anonymousGrading prop is `true` when the assignment is anonymous', function () { - assignment.anonymous_grading = true - render() - strictEqual(component.props.assignment.anonymousGrading, true) - }) - - test('the anonymousGrading prop is `false` when the assignment is not anonymous', function () { - render() - strictEqual(component.props.assignment.anonymousGrading, false) - }) - }) }); QUnit.module('#destroy', function () { diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js index a3474976c04..5b865377fd8 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js @@ -20,7 +20,6 @@ import Gradebook from 'compiled/gradezilla/Gradebook'; export function createGradebook (options = {}) { const gradebook = new Gradebook({ - anonymous_moderated_marking_enabled: false, colors: {}, context_allows_gradebook_uploads: true, context_id: '1', diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js b/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js index 108f760b7a0..f0b2c7f3731 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js @@ -42,7 +42,6 @@ QUnit.module('SubmissionTray', function (hooks) { }); const defaultProps = { - anonymousModeratedMarkingEnabled: false, contentRef (ref) { content = ref; }, @@ -202,10 +201,8 @@ QUnit.module('SubmissionTray', function (hooks) { strictEqual(speedGraderLink, speedGraderUrl); }); - test('invokes "onAnonymousSpeedGraderClick" when the SpeedGrader link is clicked ' + - 'if the assignment is anonymous and Anonymous Moderated Marking is enabled', function () { + test('invokes "onAnonymousSpeedGraderClick" when the SpeedGrader link is clicked if the assignment is anonymous', function () { const props = { - anonymousModeratedMarkingEnabled: true, assignment: { name: 'Book Report', gradingType: 'points', @@ -221,18 +218,10 @@ QUnit.module('SubmissionTray', function (hooks) { strictEqual(props.onAnonymousSpeedGraderClick.callCount, 1) }) - test('omits student_id from SpeedGrader link if enabled and assignment is ' + - 'anonymously graded and anonymous moderated marking is enabled', function() { - mountComponent({anonymousModeratedMarkingEnabled: true, assignment: {anonymousGrading: true}}); - const speedGraderLink = document.querySelector('.SubmissionTray__Container a[href*="speed_grader"]').getAttribute('href'); - notOk(speedGraderLink.match(/student_id/)) - }); - - test('includes student_id in the SpeedGrader link if enabled and assignment is ' + - 'anonymously graded and anonymous moderated marking is disabled', function() { + test('omits student_id from SpeedGrader link if enabled and assignment is anonymously graded', function() { mountComponent({assignment: {anonymousGrading: true}}); const speedGraderLink = document.querySelector('.SubmissionTray__Container a[href*="speed_grader"]').getAttribute('href'); - ok(speedGraderLink.match(/student_id/)) + notOk(speedGraderLink.match(/student_id/)) }); test('does not show SpeedGrader link if disabled', function () { diff --git a/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js b/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js index 508aebe1828..6261b7da534 100644 --- a/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js +++ b/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js @@ -24,11 +24,9 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { let assignment let submissionsLoaded - let anonymousModeratedMarkingEnabled suiteHooks.beforeEach(() => { - anonymousModeratedMarkingEnabled = false - assignment = {moderated_grading: false, grades_published: true, muted: true} + assignment = {anonymous_grading: false, grades_published: true, muted: true} submissionsLoaded = false }) @@ -36,8 +34,7 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { return new AssignmentMuterDialogManager( assignment, url, - submissionsLoaded, - anonymousModeratedMarkingEnabled + submissionsLoaded ) } @@ -95,23 +92,13 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns false when the assignment is moderated and grades have not been published', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = false assignment.moderated_grading = true submissionsLoaded = true strictEqual(createManager().isDialogEnabled(), false) }) - test('returns true for moderated assignments when Anonymous Moderated Marking is disabled', () => { - anonymousModeratedMarkingEnabled = false - assignment.grades_published = false - assignment.moderated_grading = true - submissionsLoaded = true - strictEqual(createManager().isDialogEnabled(), true) - }) - test('returns true for moderated assignments when grades have been published', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = true assignment.moderated_grading = true submissionsLoaded = true @@ -119,7 +106,6 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns true for moderated assignments when not muted', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = false assignment.moderated_grading = true assignment.muted = false @@ -128,7 +114,6 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns true for assignments when not moderated', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = true assignment.moderated_grading = false submissionsLoaded = true diff --git a/spec/javascripts/jsx/speed_graderSpec.js b/spec/javascripts/jsx/speed_graderSpec.js index 57e896cfe84..63b05b71d83 100644 --- a/spec/javascripts/jsx/speed_graderSpec.js +++ b/spec/javascripts/jsx/speed_graderSpec.js @@ -34,7 +34,14 @@ let $div QUnit.module('SpeedGrader#showDiscussion', { setup () { - fakeENV.setup(); + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) + fixtures.innerHTML = '' this.stub($, 'ajaxJSON'); this.spy($.fn, 'append'); this.originalWindowJSONData = window.jsonData; @@ -89,6 +96,7 @@ QUnit.module('SpeedGrader#showDiscussion', { $.getJSON.restore() SpeedGrader.EG.currentStudent = this.originalStudent; window.jsonData = this.originalWindowJSONData; + fixtures.innerHTML = '' fakeENV.teardown(); } }); @@ -116,7 +124,14 @@ test('showDiscussion should show private comments for non group assignments', () QUnit.module('SpeedGrader#refreshSubmissionToView', { setup () { - fakeENV.setup(); + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) + fixtures.innerHTML = '' this.stub($, 'ajaxJSON'); this.spy($.fn, 'append'); this.originalWindowJSONData = window.jsonData; @@ -155,6 +170,7 @@ QUnit.module('SpeedGrader#refreshSubmissionToView', { $.getJSON.restore() window.jsonData = this.originalWindowJSONData; SpeedGrader.EG.currentStudent = this.originalStudent; + fixtures.innerHTML = '' fakeENV.teardown(); } }) @@ -169,7 +185,13 @@ QUnit.module('#showSubmissionDetails', function(hooks) { let originalStudent hooks.beforeEach(function() { - fakeENV.setup() + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) sinon.stub(SpeedGrader.EG, 'handleSubmissionSelectionChange') originalWindowJSONData = window.jsonData window.jsonData = { @@ -183,7 +205,10 @@ QUnit.module('#showSubmissionDetails', function(hooks) { submission_state: 'not_graded', submission: { score: 7, grade: 70, submission_history: [] } } - fixtures.innerHTML = '![]()
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
document.querySelector('.ui-selectmenu-menu').remove()
})
@@ -1838,7 +1881,6 @@ QUnit.module('SpeedGrader', function() {
})
QUnit.module('#handleStudentChanged', hooks => {
- let getJSON
hooks.beforeEach(() => {
fakeENV.setup({
...ENV,
@@ -1849,18 +1891,13 @@ QUnit.module('SpeedGrader', function() {
show_help_menu_item: false
})
fixtures.innerHTML = ''
- getJSON = sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -1878,7 +1915,7 @@ QUnit.module('SpeedGrader', function() {
submission: alphaSubmission
};
setupCurrentStudent();
- const [url] = getJSON.firstCall.args;
+ const [url] = $.getJSON.firstCall.args;
const {course_id: courseId, assignment_id: assignmentId} = ENV;
const params = `anonymous_id=${alphaStudent.anonymous_id}&last_updated_at=${alphaSubmission.updated_at}`;
strictEqual(url, `/api/v1/courses/${courseId}/assignments/${assignmentId}/anonymous_provisional_grades/status?${params}`);
@@ -1918,18 +1955,13 @@ QUnit.module('SpeedGrader', function() {
`;
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
})
@@ -1980,8 +2012,6 @@ QUnit.module('SpeedGrader', function() {
<%= t('links.submit_same_score', "Use this same grade for the resubmission") %> diff --git a/app/views/jst/assignments/EditView.handlebars b/app/views/jst/assignments/EditView.handlebars index 691d78a1105..5e3b248ef52 100644 --- a/app/views/jst/assignments/EditView.handlebars +++ b/app/views/jst/assignments/EditView.handlebars @@ -161,22 +161,7 @@ {{/if}} {{#unless isQuizLTIAssignment}} - {{#if anonymousModeratedMarkingEnabled}} - - {{else}} - - {{/if}} + {{/unless}} {{#if anonymousGradingEnabled}} diff --git a/lib/api/v1/assignment.rb b/lib/api/v1/assignment.rb index dc64ca60e42..f0c1f63eecd 100644 --- a/lib/api/v1/assignment.rb +++ b/lib/api/v1/assignment.rb @@ -682,7 +682,7 @@ module Api::V1::Assignment assignment.moderated_grading = value_to_boolean(assignment_params['moderated_grading']) end - grader_changes = final_grader_changes(assignment, context, assignment_params) + grader_changes = final_grader_changes(assignment, assignment_params) assignment.final_grader_id = grader_changes.grader_id if grader_changes.grader_changed? if assignment_params.key?('anonymous_grading') && assignment.course.feature_enabled?(:anonymous_marking) @@ -773,10 +773,9 @@ module Api::V1::Assignment private - def final_grader_changes(assignment, course, assignment_params) + def final_grader_changes(assignment, assignment_params) no_changes = OpenStruct.new(grader_changed?: false) return no_changes unless assignment.moderated_grading && assignment_params.key?('final_grader_id') - return no_changes unless course.root_account.feature_enabled?(:anonymous_moderated_marking) final_grader_id = assignment_params.fetch("final_grader_id") return OpenStruct.new(grader_changed?: true, grader_id: nil) if final_grader_id.blank? diff --git a/lib/feature.rb b/lib/feature.rb index a9b3be419fe..53d912e6bdb 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -69,7 +69,7 @@ class Feature # display_name: -> { I18n.t('features.automatic_essay_grading', 'Automatic Essay Grading') }, # description: -> { I18n.t('features.automatic_essay_grading_description, 'Popup text describing the feature goes here') }, # applies_to: 'Course', # or 'RootAccount' or 'Account' or 'User' - # state: 'allowed', # or 'off', 'on', 'hidden', or 'hidden_in_prod' + # state: 'allowed', # or 'on', 'hidden', or 'hidden_in_prod' # # - 'hidden' means the feature must be set by a site admin before it will be visible # # (in that context and below) to other users # # - 'hidden_in_prod' registers 'hidden' in production environments or 'allowed' elsewhere diff --git a/lib/features/anonymous_moderated_marking.rb b/lib/features/anonymous_moderated_marking.rb index 10b41ef8660..367fdda69c7 100644 --- a/lib/features/anonymous_moderated_marking.rb +++ b/lib/features/anonymous_moderated_marking.rb @@ -25,31 +25,21 @@ Feature.register( DESCRIPTION }, applies_to: 'Account', - state: 'allowed', + state: 'hidden', root_opt_in: true, beta: true, - development: false + development: true }, anonymous_marking: { display_name: -> { I18n.t 'Anonymous Marking' }, description: -> { I18n.t <<~DESCRIPTION - Enable anonymous marking of assignments. Only relevant if the Anonymous Moderated Marking flag is enabled. + Enable anonymous marking of assignments. DESCRIPTION }, applies_to: 'Course', state: 'allowed', root_opt_in: true, - beta: true, - development: false, - visible_on: ->(context) do - if context.is_a?(Account) - context.feature_enabled?(:anonymous_moderated_marking) - elsif context.is_a?(Course) - context.root_account.feature_enabled?(:anonymous_moderated_marking) - else - false - end - end + beta: true } ) diff --git a/lib/features/moderated_grading.rb b/lib/features/moderated_grading.rb index 9fd7c251a0e..dc5cd2068b3 100644 --- a/lib/features/moderated_grading.rb +++ b/lib/features/moderated_grading.rb @@ -21,22 +21,12 @@ Feature.register( display_name: -> { I18n.t 'Moderated Grading' }, description: -> { I18n.t <<~DESCRIPTION - Enable moderated grading. Only relevant if the Anonymous Moderated Marking flag is enabled. + Enable moderated grading. DESCRIPTION }, applies_to: 'Course', state: 'allowed', root_opt_in: true, - beta: true, - development: false, - visible_on: ->(context) do - if context.is_a?(Account) - context.feature_enabled?(:anonymous_moderated_marking) - elsif context.is_a?(Course) - context.root_account.feature_enabled?(:anonymous_moderated_marking) - else - false - end - end + beta: true } ) diff --git a/lib/gradebook_importer.rb b/lib/gradebook_importer.rb index fa390d91fa8..ad87ba18845 100644 --- a/lib/gradebook_importer.rb +++ b/lib/gradebook_importer.rb @@ -21,7 +21,7 @@ require 'csv' class GradebookImporter ASSIGNMENT_PRELOADED_FIELDS = %i/ id title points_possible grading_type updated_at context_id context_type group_category_id - created_at due_at only_visible_to_overrides + created_at due_at only_visible_to_overrides moderated_grading /.freeze class NegativeId diff --git a/lib/moderation.rb b/lib/moderation.rb index e691e7153f4..07735c1dee7 100644 --- a/lib/moderation.rb +++ b/lib/moderation.rb @@ -18,7 +18,7 @@ module Moderation def create_moderation_selections_for_assignment(assignment_id, student_ids, student_context) assignment = Assignment.find(assignment_id) - return unless assignment.root_account.feature_enabled?(:anonymous_moderated_marking) && assignment.moderated_grading + return unless assignment.moderated_grading # Add selections for students in Student IDs already_moderated_ids = assignment.moderated_grading_selections.pluck(:student_id) diff --git a/public/javascripts/speed_grader.js b/public/javascripts/speed_grader.js index 8856cdbff12..0899ccdf1d4 100644 --- a/public/javascripts/speed_grader.js +++ b/public/javascripts/speed_grader.js @@ -45,7 +45,6 @@ import htmlEscape from './str/htmlEscape'; import rubricAssessment from './rubric_assessment'; import SpeedgraderSelectMenu from './speed_grader_select_menu'; import SpeedgraderHelpers, { - isAnonymousModeratedMarkingEnabled, setupAnonymizableId, setupAnonymizableStudentId, setupAnonymizableUserId, @@ -471,13 +470,7 @@ function setupHeader () { modal: $('#unmute_dialog') }, nav: $gradebook_header.find('#prev-student-button, #next-student-button'), - settings: { - form: $('#settings_form'), - link: $('#settings_link') - }, - keyinfo: { - icon: $('#keyboard-shortcut-info-icon') - } + settings: { form: $('#settings_form') } }, courseId: utils.getParam('courses'), assignmentId: utils.getParam('assignment_id'), @@ -492,10 +485,6 @@ function setupHeader () { this.elements.mute.link.click($.proxy(this.onMuteClick, this)); this.elements.settings.form.submit(this.submitSettingsForm.bind(this)); - if (!isAnonymous) { - this.elements.settings.link.click(this.showSettingsModal.bind(this)); - } - this.elements.keyinfo.icon.click(this.keyboardShortcutInfoModal.bind(this)); }, createModals () { this.elements.settings.form.dialog({ @@ -1346,20 +1335,18 @@ EG = { } if (ENV.grading_role == "moderator") { this.current_prov_grade_index = null; - this.handleModerationTabs(0); // sets up tabs and loads first grade + this.removeModerationBarAndShowSubmission(); - if (isAnonymousModeratedMarkingEnabled()) { - this.renderProvisionalGradeSelector({showingNewStudent: true}) + this.renderProvisionalGradeSelector({showingNewStudent: true}) - const selectedGrade = currentStudentProvisionalGrades().find(grade => grade.selected); - if (selectedGrade) { - this.setActiveProvisionalGradeFields({ - label: provisionalGraderDisplayNames[selectedGrade.provisional_grade_id], - grade: selectedGrade - }); - } else { - this.setActiveProvisionalGradeFields(); - } + const selectedGrade = currentStudentProvisionalGrades().find(grade => grade.selected); + if (selectedGrade) { + this.setActiveProvisionalGradeFields({ + label: provisionalGraderDisplayNames[selectedGrade.provisional_grade_id], + grade: selectedGrade + }); + } else { + this.setActiveProvisionalGradeFields(); } } else { // showSubmissionOverride is optionally set if the user is @@ -1387,94 +1374,6 @@ EG = { this.setReadOnly(false) }, - handleModerationTabs: function(index_to_load) { - if (isAnonymousModeratedMarkingEnabled()) { - this.removeModerationBarAndShowSubmission() - return - } - - var prov_grades = this.currentStudent.submission && this.currentStudent.submission.provisional_grades; - var final_grade = this.currentStudent.submission && this.currentStudent.submission.final_provisional_grade; - - if (prov_grades && prov_grades.length == 1 && !final_grade && !prov_grades[0].readonly) { - $full_width_container.removeClass("with_moderation_tabs"); - $moderation_bar.hide(); - EG.showProvisionalGrade(0); - } else if (prov_grades && prov_grades.length > 0) { - if (prov_grades.length == 1) { - // hide and disable second mark tab - $moderation_tab_2nd.hide(); - $moderation_tabs_div.tabs('disable', 1); - - if (this.currentStudent.needs_provisional_grade || final_grade) { - $new_mark_container.show(); - $new_mark_copy_link2_menu_item.hide(); // hide copy 2nd mark - if (final_grade) { - $new_mark_link_menu_item.hide(); - } else { - EG.can_add_review = true; - $new_mark_link_menu_item.show(); - } - } else { - $new_mark_container.hide(); // hide new mark dropdown if not selected for moderation - } - } else if (prov_grades.length == 2) { - // enable and show second mark tab - $moderation_tabs_div.tabs('enable', 1); - $moderation_tab_2nd.show(); - $new_mark_container.show(); - $new_mark_link_menu_item.hide(); - if (prov_grades[1].provisional_grade_id) { - $new_mark_copy_link2_menu_item.show(); // show copy 2nd mark - } else { - $new_mark_copy_link2_menu_item.hide(); // don't show if it's a new unsaved mark - } - } - - if (final_grade) { - $moderation_tabs_div.tabs('enable', 2); - $moderation_tab_final.show(); - $new_mark_final_link_menu_item.hide(); - } else { - $moderation_tabs_div.tabs('disable', 2); - $moderation_tab_final.hide(); - $new_mark_final_link_menu_item.show(); - } - - $full_width_container.addClass("with_moderation_tabs"); - $moderation_bar.show(); - - if (this.add_review && this.can_add_review) { - this.add_review = false; - this.newProvisionalGrade('new', 1); - } else { - if (this.selected_provisional_grade_id) { - var selected_id = this.selected_provisional_grade_id; - // load provisional grade id from anchor hash - - if (final_grade && final_grade.provisional_grade_id == selected_id) { - index_to_load = 'final'; // final mark - } else { - $.each(prov_grades, function (idx, pg) { - if (pg.provisional_grade_id == selected_id) { - index_to_load = idx; - } - }); - } - - this.selected_provisional_grade_id = null; // don't load it again - } - if (index_to_load == 'final') { - $moderation_tab_final.find('a').click(); - } else { - $moderation_tabs.eq(index_to_load).find('a').click(); // show a grade - } - } - } else { - this.removeModerationBarAndShowSubmission() - } - }, - updateModerationTabs: function() { if (!this.currentStudent.submission) return; var prov_grades = this.currentStudent.submission.provisional_grades; @@ -1547,11 +1446,10 @@ EG = { }; if (index == 1) { this.currentStudent.submission.provisional_grades.push(new_mark); - this.handleModerationTabs(1); } else if (index == 'final') { this.currentStudent.submission.final_provisional_grade = new_mark; - this.handleModerationTabs('final'); } + this.removeModerationBarAndShowSubmission(); } else if (type == 'copy') { if (!this.currentStudent.submission.final_provisional_grade || confirm(I18n.t("Are you sure you want to copy to the final mark? This will overwrite the existing mark."))) { @@ -1564,7 +1462,7 @@ EG = { EG.currentStudent.submission_state = SpeedgraderHelpers.submissionState(EG.currentStudent, ENV.grading_role); EG.current_prov_grade_index = null; - EG.handleModerationTabs('final'); + this.removeModerationBarAndShowSubmission(); EG.updateModerationTabs(); $moderation_tab_final.focus(); }) @@ -2648,11 +2546,7 @@ EG = { $multiple_submissions.change(); EG.showGrade(); - if ( - isAnonymousModeratedMarkingEnabled() && - ENV.grading_role === 'moderator' && - currentStudentProvisionalGrades().length > 0 - ) { + if (ENV.grading_role === 'moderator' && currentStudentProvisionalGrades().length > 0) { // This is the ID of the possibly-new grade that the server returned const newProvisionalGradeId = submissions[0].submission.provisional_grade_id; const existingGrade = currentStudentProvisionalGrades().find( @@ -3201,10 +3095,7 @@ function currentStudentProvisionalGrades () { export default { setup () { setupSelectors() - - if (isAnonymousModeratedMarkingEnabled()) { - renderSettingsMenu() - } + renderSettingsMenu() function registerQuizzesNext (overriddenShowSubmission) { showSubmissionOverride = overriddenShowSubmission; diff --git a/public/javascripts/speed_grader_helpers.js b/public/javascripts/speed_grader_helpers.js index f2f45e15e46..e814c45ae6e 100644 --- a/public/javascripts/speed_grader_helpers.js +++ b/public/javascripts/speed_grader_helpers.js @@ -22,12 +22,8 @@ import I18n from 'i18n!gradebook' import './jquery.instructure_date_and_time' import './jquery.instructure_misc_helpers' -export function isAnonymousModeratedMarkingEnabled () { - return !!ENV.anonymous_moderated_marking_enabled -} - export function setupIsAnonymous ({anonymous_grading}) { - return isAnonymousModeratedMarkingEnabled() && anonymous_grading + return anonymous_grading } export function setupAnonymizableId (isAnonymous) { @@ -168,8 +164,7 @@ export function setupAnonymizableUserId (isAnonymous) { setupIsAnonymous, setupAnonymizableId, setupAnonymizableUserId, - setupAnonymizableStudentId, - isAnonymousModeratedMarkingEnabled + setupAnonymizableStudentId } export default speedgraderHelpers diff --git a/spec/apis/lti/originality_reports_api_spec.rb b/spec/apis/lti/originality_reports_api_spec.rb index fe34d8e8b6e..1774ed1455a 100644 --- a/spec/apis/lti/originality_reports_api_spec.rb +++ b/spec/apis/lti/originality_reports_api_spec.rb @@ -59,7 +59,6 @@ module Lti create: "/api/lti/assignments/#{@assignment.id}/submissions/#{@submission.id}/originality_report" } - allow_any_instance_of(Account).to receive(:feature_enabled?).with(:anonymous_moderated_marking).and_return(false) allow_any_instance_of(Account).to receive(:feature_enabled?).with(:plagiarism_detection_platform).and_return(true) end diff --git a/spec/apis/v1/anonymous_provisional_grades_api_spec.rb b/spec/apis/v1/anonymous_provisional_grades_api_spec.rb index 09f6f05081d..002809bec22 100644 --- a/spec/apis/v1/anonymous_provisional_grades_api_spec.rb +++ b/spec/apis/v1/anonymous_provisional_grades_api_spec.rb @@ -26,7 +26,7 @@ describe 'Anonymous Provisional Grades API', type: :request do course_with_teacher(active_all: true) ta_in_course(active_all: true) @student = student_in_course(active_all: true).user - @assignment = @course.assignments.create!(moderated_grading: true) + @assignment = @course.assignments.create!(moderated_grading: true, grader_count: 1) @submission = @assignment.submit_homework(@student, body: 'EHLO') @path = "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/anonymous_provisional_grades/status" @params = { diff --git a/spec/apis/v1/assignments_api_spec.rb b/spec/apis/v1/assignments_api_spec.rb index 046ad31d94b..dc9829c308f 100644 --- a/spec/apis/v1/assignments_api_spec.rb +++ b/spec/apis/v1/assignments_api_spec.rb @@ -2528,144 +2528,119 @@ describe AssignmentsApiController, type: :request do describe 'final_grader_id' do before(:once) do course_with_teacher(active_all: true) + course_with_teacher(active_all: true) end - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - course_with_teacher(active_all: true) - @course.root_account.enable_feature!(:anonymous_moderated_marking) - end - - it 'allows updating final_grader_id for a participating instructor with "Select Final Grade" permissions' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - expect(json_parse(response.body)['final_grader_id']).to eq @teacher.id - end - - it 'does not allow updating final_grader_id if the user does not have "Select Final Grade" permissions' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - @course.root_account.role_overrides.create!( - permission: 'select_final_grade', - role: teacher_role, - enabled: false - ) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'user does not have permission to select final grade' - end - - it 'does not allow updating final_grader_id if the user is not active in the course' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - deactivated_teacher = User.create! - deactivated_teacher = @course.enroll_teacher(deactivated_teacher, enrollment_state: 'inactive') - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: deactivated_teacher.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'course has no active instructors with this ID' - end - - it 'does not allow updating final_grader_id if the course has no user with the supplied ID' do - user_not_enrolled_in_course = User.create! - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: user_not_enrolled_in_course.id } }, - ) - error = json_parse(response.body)['errors']['final_grader_id'].first - expect(error['message']).to eq 'course has no active instructors with this ID' - end - - it 'skips final_grader_id validation if the field has not changed' do - assignment = @course.assignments.create!( - final_grader: @teacher, - grader_count: 2, - moderated_grading: true, - name: 'Some Assignment' - ) - @course.root_account.role_overrides.create!( - permission: 'select_final_grade', - role: teacher_role, - enabled: false - ) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { name: 'a fancy new name' } }, - ) - expect(response).to be_success - end + it 'allows updating final_grader_id for a participating instructor with "Select Final Grade" permissions' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: @teacher.id } }, + ) + expect(json_parse(response.body)['final_grader_id']).to eq @teacher.id end - context 'when Anonymous Moderated Marking is disabled' do - it 'ignores updates to final_grader_id' do - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true) - api_call( - :put, - "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", - { - controller: 'assignments_api', - action: 'update', - format: 'json', - course_id: @course.id, - id: assignment.to_param - }, - { assignment: { final_grader_id: @teacher.id } }, - ) - expect(json_parse(response.body)['final_grader_id']).to be_nil - end + it 'does not allow updating final_grader_id if the user does not have "Select Final Grade" permissions' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + @course.root_account.role_overrides.create!( + permission: 'select_final_grade', + role: teacher_role, + enabled: false + ) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: @teacher.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'user does not have permission to select final grade' + end + + it 'does not allow updating final_grader_id if the user is not active in the course' do + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + deactivated_teacher = User.create! + deactivated_teacher = @course.enroll_teacher(deactivated_teacher, enrollment_state: 'inactive') + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: deactivated_teacher.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'course has no active instructors with this ID' + end + + it 'does not allow updating final_grader_id if the course has no user with the supplied ID' do + user_not_enrolled_in_course = User.create! + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 2) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { final_grader_id: user_not_enrolled_in_course.id } }, + ) + error = json_parse(response.body)['errors']['final_grader_id'].first + expect(error['message']).to eq 'course has no active instructors with this ID' + end + + it 'skips final_grader_id validation if the field has not changed' do + assignment = @course.assignments.create!( + final_grader: @teacher, + grader_count: 2, + moderated_grading: true, + name: 'Some Assignment' + ) + @course.root_account.role_overrides.create!( + permission: 'select_final_grade', + role: teacher_role, + enabled: false + ) + api_call( + :put, + "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", + { + controller: 'assignments_api', + action: 'update', + format: 'json', + course_id: @course.id, + id: assignment.to_param + }, + { assignment: { name: 'a fancy new name' } }, + ) + expect(response).to be_success end end it 'allows updating grader_count' do course_with_teacher(active_all: true) - assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true) + assignment = @course.assignments.create!(name: 'Some Assignment', moderated_grading: true, grader_count: 1) api_call( :put, "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}", @@ -4546,7 +4521,6 @@ describe AssignmentsApiController, type: :request do context "when the anonymous marking feature flag is set" do before(:once) do - @course.account.enable_feature!(:anonymous_moderated_marking) @course.enable_feature!(:anonymous_marking) end diff --git a/spec/apis/v1/moderation_set_api_spec.rb b/spec/apis/v1/moderation_set_api_spec.rb index f9104a0a452..90db1f608c4 100644 --- a/spec/apis/v1/moderation_set_api_spec.rb +++ b/spec/apis/v1/moderation_set_api_spec.rb @@ -26,13 +26,13 @@ describe 'Moderated Grades API', type: :request do sec2 = @course.course_sections.create!(:name => "section 2") @assignment = @course.assignments.create! name: "asdf" @assignment.update_attribute :moderated_grading, true + @assignment.update_attribute :grader_count, 1 @student1, @student2, @student3 = n_students_in_course(3, course: @course) @course.enroll_student(@student1, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student2, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student3, :section => sec1, :allow_multiple_enrollments => true) @course.enroll_student(@student3, :section => sec2, :allow_multiple_enrollments => true) @user = @teacher - @assignment.moderated_grading_selections.create! student: @student1 end before :each do @@ -46,7 +46,7 @@ describe 'Moderated Grades API', type: :request do {controller: 'moderation_set', action: 'index', format: 'json', course_id: @course.id, assignment_id: @assignment.id} expect(response).to be_success - expect(json.size).to eq 1 + expect(json.size).to eq 3 expect(json.first["id"]).to eq @student1.id end diff --git a/spec/apis/v1/provisional_grades_api_spec.rb b/spec/apis/v1/provisional_grades_api_spec.rb index d996a33cd4d..c74885a7eab 100644 --- a/spec/apis/v1/provisional_grades_api_spec.rb +++ b/spec/apis/v1/provisional_grades_api_spec.rb @@ -26,7 +26,9 @@ describe 'Provisional Grades API', type: :request do course_with_student :active_all => true ta_in_course :active_all => true @assignment = @course.assignments.build + @assignment.grader_count = 1 @assignment.moderated_grading = true + @assignment.final_grader_id = @teacher.id @assignment.save! subs = @assignment.grade_student @student, :grader => @ta, :score => 0, :provisional => true @pg = subs.first.provisional_grade(@ta) @@ -37,52 +39,45 @@ describe 'Provisional Grades API', type: :request do end it "should fail if the student isn't in the moderation set" do + @assignment.moderated_grading_selections.destroy_all json = api_call_as_user(@teacher, :put, @path, @params, {}, {}, { :expected_status => 400 }) expect(json['message']).to eq 'student not in moderation set' end - context "with moderation set" do - before(:once) do - @selection = @assignment.moderated_grading_selections.build - @selection.student_id = @student.id - @selection.save! - end - - it "should require :moderate_grades" do - api_call_as_user(@ta, :put, @path, @params, {}, {}, { :expected_status => 401 }) - end - - it "should select a provisional grade" do - json = api_call_as_user(@teacher, :put, @path, @params) - expect(json).to eq({ - 'assignment_id' => @assignment.id, - 'student_id' => @student.id, - 'selected_provisional_grade_id' => @pg.id - }) - expect(@selection.reload.provisional_grade).to eq(@pg) - end - - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :put - - it "should use anonymous_id instead of student_id if user cannot view student names" do - allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false - json = api_call_as_user(@teacher, :put, @path, @params) - expect(json).to eq({ - 'assignment_id' => @assignment.id, - 'anonymous_id' => @pg.submission.anonymous_id, - 'selected_provisional_grade_id' => @pg.id - }) - expect(@selection.reload.provisional_grade).to eq(@pg) - end + it "should select a provisional grade" do + json = api_call_as_user(@teacher, :put, @path, @params) + expect(json).to eq({ + 'assignment_id' => @assignment.id, + 'student_id' => @student.id, + 'selected_provisional_grade_id' => @pg.id + }) + expect(@assignment.moderated_grading_selections.where(student_id: @student.id).first.provisional_grade).to eq(@pg) end + + it "should use anonymous_id instead of student_id if user cannot view student names" do + allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false + json = api_call_as_user(@teacher, :put, @path, @params) + expect(json).to eq({ + 'assignment_id' => @assignment.id, + 'anonymous_id' => @pg.submission.anonymous_id, + 'selected_provisional_grade_id' => @pg.id + }) + expect(@assignment.moderated_grading_selections.where(student_id: @student.id).first.provisional_grade).to eq(@pg) + end + + it_behaves_like 'authorization for provisional final grade selection', :put end describe "copy_to_final_mark" do before(:once) do course_with_student :active_all => true ta_in_course :active_all => true - @assignment = @course.assignments.create! submission_types: 'online_text_entry', moderated_grading: true - @assignment.moderated_grading_selections.create! student: @student + @assignment = @course.assignments.create!( + submission_types: 'online_text_entry', + moderated_grading: true, + grader_count: 1, + final_grader_id: @teacher.id + ) @submission = @assignment.submit_homework(@student, :submission_type => 'online_text_entry', :body => 'hallo') @pg = @submission.find_or_create_provisional_grade!(@ta, score: 80) @submission.add_comment(:commenter => @ta, :comment => 'huttah!', :provisional => true) @@ -121,7 +116,7 @@ describe 'Provisional Grades API', type: :request do expect(json['crocodoc_urls']).to eq([]) end - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :post + it_behaves_like 'authorization for provisional final grade selection', :post end describe "publish" do @@ -135,6 +130,7 @@ describe 'Provisional Grades API', type: :request do end it "requires a moderated assignment" do + @assignment.update_attribute :final_grader_id, @teacher.id json = api_call_as_user(@teacher, :post, @path, @params, {}, {}, { :expected_status => 400 }) expect(json['message']).to eq 'Assignment does not use moderated grading' end @@ -142,16 +138,14 @@ describe 'Provisional Grades API', type: :request do context "with moderated assignment" do before(:once) do @assignment.update_attribute :moderated_grading, true + @assignment.update_attribute :grader_count, 2 + @assignment.update_attribute :final_grader_id, @teacher.id end it "responds with a 200 for a valid request" do api_call_as_user(@teacher, :post, @path, @params, {}, {}, expected_status: 200) end - it "requires moderate_grades permissions" do - api_call_as_user(@ta, :post, @path, @params, {}, {}, { :expected_status => 401 }) - end - it "requires manage_grades permissions" do @course.root_account.role_overrides.create!( permission: :manage_grades, @@ -209,12 +203,6 @@ describe 'Provisional Grades API', type: :request do end it "publishes provisional grades" do - @student.communication_channels.create(:path => 'student@example.edu', :path_type => 'email').confirm - n = Notification.create!(:name => 'Submission Graded', :category => 'TestImmediately') - NotificationPolicy.create!(:notification => n, - :communication_channel => @student.communication_channel, - :frequency => 'immediately') - expect(@submission.workflow_state).to eq 'submitted' expect(@submission.score).to be_nil expect(@student.messages).to be_empty @@ -227,15 +215,12 @@ describe 'Provisional Grades API', type: :request do @assignment.reload expect(@assignment.grades_published_at).to be_within(1.minute.to_i).of(Time.now.utc) - - @student.reload - expect(@student.messages.map(&:notification_name)).to be_include 'Submission Graded' end it "publishes the selected provisional grade when the student is in the moderation set" do @submission.provisional_grade(@ta).update_attribute(:graded_at, 1.minute.ago) - sel = @assignment.moderated_grading_selections.create!(:student => @student) + sel = @assignment.moderated_grading_selections.find_by(student: @student) @other_ta = user_factory :active_user => true @course.enroll_ta @other_ta, :enrollment_state => 'active' @@ -255,9 +240,7 @@ describe 'Provisional Grades API', type: :request do context "with one provisional grade" do it "publishes the only provisional grade if none have been explicitly selected" do course_with_user("TaEnrollment", course: @course, active_all: true) - second_ta = @user @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @assignment.grade_student(@student, grader: @ta, score: 72, provisional: true) api_call_as_user(@teacher, :post, @path, @params) @@ -274,7 +257,6 @@ describe 'Provisional Grades API', type: :request do it "publishes even when some submissions have no grades" do @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @user = @teacher raw_api_call(:post, @path, @params) @@ -286,7 +268,6 @@ describe 'Provisional Grades API', type: :request do it "does not publish if none have been explicitly selected" do @submission = @assignment.submit_homework(@student, body: "hello") - @assignment.moderated_grading_selections.create!(student: @student) @assignment.grade_student(@student, grader: @ta, score: 72, provisional: true) @assignment.grade_student(@student, grader: @second_ta, score: 88, provisional: true) @@ -303,8 +284,7 @@ describe 'Provisional Grades API', type: :request do student_2 = student_in_course(active_all: true, course: @course).user submission_1 = @assignment.submit_homework(student_1, body: "hello") submission_2 = @assignment.submit_homework(student_2, body: "hello") - selection_1 = @assignment.moderated_grading_selections.create!(student: student_1) - @assignment.moderated_grading_selections.create!(student: student_2) + selection_1 = @assignment.moderated_grading_selections.find_by(student: student_1) @assignment.grade_student(student_1, grader: @ta, score: 12, provisional: true) @assignment.grade_student(student_1, grader: @second_ta, score: 34, provisional: true) @assignment.grade_student(student_2, grader: @ta, score: 56, provisional: true) @@ -322,7 +302,7 @@ describe 'Provisional Grades API', type: :request do end end - it_behaves_like 'authorization when Anonymous Moderated Marking is enabled', :post + it_behaves_like 'authorization for provisional final grade selection', :post end end end diff --git a/spec/apis/v1/submissions_api_spec.rb b/spec/apis/v1/submissions_api_spec.rb index 786f6ed300a..e5673cfa1eb 100644 --- a/spec/apis/v1/submissions_api_spec.rb +++ b/spec/apis/v1/submissions_api_spec.rb @@ -1729,6 +1729,7 @@ describe 'Submissions API', type: :request do points_possible: 10 ) @assignment.update_attribute(:moderated_grading, true) + @assignment.update_attribute(:grader_count, 2) submission = @assignment.submit_homework(@student, body: 'nice work') @provisional_grade = submission.provisional_grades.build do |grade| grade.scorer = @teacher @@ -2805,7 +2806,10 @@ describe 'Submissions API', type: :request do end it "creates a provisional grade and comment" do - @assignment.update_attribute(:moderated_grading, true) + @assignment.moderated_grading = true + @assignment.grader_count = 2 + @assignment.final_grader = @teacher + @assignment.save! submission = @assignment.submit_homework(@student, :body => 'what') json = api_call( @@ -2844,7 +2848,10 @@ describe 'Submissions API', type: :request do end it "creates a provisional grade and comment when no submission exists" do - @assignment.update_attribute(:moderated_grading, true) + @assignment.moderated_grading = true + @assignment.grader_count = 2 + @assignment.final_grader = @teacher + @assignment.save! json = api_call( :put, @@ -3864,14 +3871,13 @@ describe 'Submissions API', type: :request do course_with_teacher_logged_in active_all: true student_in_course active_all: true @user = @teacher - assignment = @course.assignments.create!(moderated_grading: true) + assignment = @course.assignments.create!(moderated_grading: true, grader_count: 1) submission = assignment.submit_homework(@student, submission_type: 'online_upload', attachments: [crocodocable_attachment_model(context: @student)]) provisional_grade = submission.find_or_create_provisional_grade!(@teacher, score: 1) - assignment.moderated_grading_selections.create! do |s| - s.student = @student - s.provisional_grade = provisional_grade - end + assignment.moderated_grading_selections. + where(student_id: @student.id).first. + update_attribute(:provisional_grade, provisional_grade) assignment.update(grades_published_at: 1.hour.ago) submission.reload submission.attachments.first.create_crocodoc_document(uuid: '1234', @@ -4206,6 +4212,7 @@ describe 'Submissions API', type: :request do @student2 = student_in_course(:active_all => true).user @assignment = @course.assignments.build @assignment.moderated_grading = true + @assignment.grader_count = 1 @assignment.save! @assignment.submit_homework @student1, :body => 'EHLO' @path = "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/gradeable_students" @@ -4263,35 +4270,31 @@ describe 'Submissions API', type: :request do api_call_as_user(@ta, :get, @path, @params, {}, {}, { :expected_status => 401 }) end - context "when Anonymous Moderated Marking is enabled" do - before(:once) { @course.root_account.enable_feature!(:anonymous_moderated_marking) } + it "is unauthorized when the user is not the assigned final grader" do + api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 401) + end - it "is unauthorized when the user is not the assigned final grader" do - api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 401) - end + it "is unauthorized when the user is an account admin without 'Select Final Grade for Moderation' permission" do + @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) + api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 401) + end - it "is unauthorized when the user is an account admin without 'Select Final Grade for Moderation' permission" do - @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) - api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 401) - end + it "is authorized when the user is the final grader" do + @assignment.update!(final_grader: @teacher, grader_count: 2) + api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 200) + end - it "is authorized when the user is the final grader" do - @assignment.update!(final_grader: @teacher, grader_count: 2) - api_call_as_user(@teacher, :get, @path, @params, {}, {}, expected_status: 200) - end - - it "is authorized when the user is an account admin with 'Select Final Grade for Moderation' permission" do - api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 200) - end + it "is authorized when the user is an account admin with 'Select Final Grade for Moderation' permission" do + api_call_as_user(account_admin_user, :get, @path, @params, {}, {}, expected_status: 200) end it "includes provisional grades with selections" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) json = api_call_as_user(@teacher, :get, @path, @params) expect(json).to match_array( [{"id"=>@student1.id, @@ -4321,12 +4324,12 @@ describe 'Submissions API', type: :request do end it "anonymizes speedgrader_url if anonymously grading" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false json = api_call_as_user(@teacher, :get, @path, @params) anonymous_id = @assignment.submission_for_student(@student1).anonymous_id @@ -4339,12 +4342,12 @@ describe 'Submissions API', type: :request do end it "anonymizes scorer id of provisional grade if grading double blind" do + @assignment.update!(final_grader: @teacher) sub = @assignment.grade_student(@student1, :score => 90, :grader => @ta, :provisional => true).first pg = sub.provisional_grades.first - sel = @assignment.moderated_grading_selections.build - sel.student_id = @student1.id - sel.selected_provisional_grade_id = pg.id - sel.save! + @assignment.moderated_grading_selections. + where(student_id: @student1.id).first. + update_attribute(:provisional_grade, pg) allow_any_instance_of(Assignment).to receive(:can_view_student_names?).and_return false allow_any_instance_of(Assignment).to receive(:can_view_other_grader_identities?).and_return false json = api_call_as_user(@teacher, :get, @path, @params) @@ -4363,6 +4366,7 @@ describe 'Submissions API', type: :request do @student2 = student_in_course(:active_all => true).user @assignment1 = @course.assignments.build @assignment1.moderated_grading = true + @assignment1.grader_count = 1 @assignment1.save! @assignment2 = @course.assignments.build @assignment2.save! diff --git a/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js b/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js index 06c09c0c8fc..c77920fda2b 100644 --- a/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js +++ b/spec/coffeescripts/gradebook/GradebookHeaderMenuSpec.js @@ -62,7 +62,7 @@ QUnit.module('GradebookHeaderMenu#hideMenuActionsWithUnmetDependencies', { submissions_downloads: 1 } this.gradebook = { - options: {anonymous_moderated_marking_enabled: false, gradebook_is_editable: true} + options: {gradebook_is_editable: true} } this.menuElement = document.createElement('ul') this.createMenu(this.menuElement) @@ -180,7 +180,7 @@ QUnit.module('GradebookHeaderMenu#disableUnavailableMenuActions', { this.createMenu(this.menuElement) this.menu = $(this.menuElement) this.gradebook = { - options: {anonymous_moderated_marking_enabled: false, gradebook_is_editable: true} + options: {gradebook_is_editable: true} } }, teardown() { @@ -242,28 +242,18 @@ test('does not disable "Set Default Grade" when isAdmin', function() { }) test('disables "Unmute Assignment" when the assignment is moderated and grades have not been published', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = true this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: true} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), 'true') }) -test('does not disable "Unmute Assignment" when Anonymous Moderated Marking is disabled', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = false - this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: true} - this.disableUnavailableMenuActions(this.menu) - strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) -}) - test('does not disable "Unmute Assignment" when grades are published', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = false this.assignment = {moderated_grading: true, grades_published: true, inClosedGradingPeriod: false, muted: true} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) }) -test('does not disable "Mute Assignment"', function () { - this.gradebook.options.anonymous_moderated_marking_enabled = true +test('does not disable "Mute Assignment" when the assignment can be muted', function () { this.assignment = {moderated_grading: true, grades_published: false, inClosedGradingPeriod: false, muted: false} this.disableUnavailableMenuActions(this.menu) strictEqual(this.menu.find('[data-action="toggleMuting"]')[0].getAttribute('aria-disabled'), null) diff --git a/spec/coffeescripts/gradebook/GradebookSpec.js b/spec/coffeescripts/gradebook/GradebookSpec.js index 5f6fa237849..6d0ae7a714a 100644 --- a/spec/coffeescripts/gradebook/GradebookSpec.js +++ b/spec/coffeescripts/gradebook/GradebookSpec.js @@ -943,43 +943,27 @@ QUnit.module('Gradebook#gotAllAssignmentGroups', suiteHooks => { $('#assignment_group_weights_dialog').remove() }) - QUnit.module('when Anonymous Moderated Marking is enabled', hooks => { - hooks.beforeEach(() => { - gradebook.options.anonymous_moderated_marking_enabled = true - }) + test('sets moderation_in_progress to true for a moderated assignment whose grades are not published', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, true) }) - test('sets moderation_in_progress to true for a moderated assignment whose grades are not published', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, true) }) - - test('sets moderation_in_progress to false for a moderated assignment whose grades are published', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedPublishedAssignment.moderation_in_progress, false) - }) - - test('sets moderation_in_progress to false for an unmoderated assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(unmoderatedAssignment.moderation_in_progress, false) - }) - - test('sets hide_grades_when_muted to true for an anonymous assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(anonymousUnmoderatedAssignment.hide_grades_when_muted, true) - }) - - test('sets hide_grades_when_muted to false for a non-anonymous assignment', () => { - gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(unmoderatedAssignment.hide_grades_when_muted, false) - }) + test('sets moderation_in_progress to false for a moderated assignment whose grades are published', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(moderatedPublishedAssignment.moderation_in_progress, false) }) - test('does not set moderation_in_progress when anonymous moderated marking is off', () => { + test('sets moderation_in_progress to false for an unmoderated assignment', () => { gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.moderation_in_progress, undefined) + strictEqual(unmoderatedAssignment.moderation_in_progress, false) }) - test('does not set hide_grades_when_muted when anonymous moderated marking is off', () => { + test('sets hide_grades_when_muted to true for an anonymous assignment', () => { gradebook.gotAllAssignmentGroups(assignmentGroups) - strictEqual(moderatedUnpublishedAssignment.hide_grades_when_muted, undefined) + strictEqual(anonymousUnmoderatedAssignment.hide_grades_when_muted, true) + }) + + test('sets hide_grades_when_muted to false for a non-anonymous assignment', () => { + gradebook.gotAllAssignmentGroups(assignmentGroups) + strictEqual(unmoderatedAssignment.hide_grades_when_muted, false) }) }) diff --git a/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js b/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js index 7ada7230b3c..e8fbccba9d1 100644 --- a/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js +++ b/spec/coffeescripts/gradebook/SubmissionDetailsDialogSpec.js @@ -59,9 +59,7 @@ test('speed_grader_enabled sets speedgrader url', function() { equal(dialog.dialog.find('.more-details-link').length, 1) }) -test('speedGraderUrl excludes student id when Anonymous Moderated Marking is ' + -'enabled and the assignment is anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = true +test('speedGraderUrl excludes student id when assignment is anonymously graded', function() { this.assignment.anonymous_grading = true this.options.context_url = 'http://some-fake-url' const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) @@ -69,28 +67,7 @@ test('speedGraderUrl excludes student id when Anonymous Moderated Marking is ' + notOk(dialog.submission.speedGraderUrl.match(/student_id/)) }) -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'enabled and the assignment is not anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = true - this.options.context_url = 'http://some-fake-url' - const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) - - ok(dialog.submission.speedGraderUrl.match(/student_id/)) -}) - -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'disabled and the assignment is anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = false - this.assignment.anonymous_grading = true - this.options.context_url = 'http://some-fake-url' - const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) - - ok(dialog.submission.speedGraderUrl.match(/student_id/)) -}) - -test('speedGraderUrl includes student id when Anonymous Moderated Marking is ' + -'disabled and the assignment is not anonymously graded', function() { - this.options.anonymous_moderated_marking_enabled = false +test('speedGraderUrl includes student id when assignment is not anonymously graded', function() { this.options.context_url = 'http://some-fake-url' const dialog = new SubmissionDetailsDialog(this.assignment, this.user, this.options) diff --git a/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js b/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js index 831f317ad13..441e79ef2c5 100644 --- a/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js +++ b/spec/coffeescripts/jsx/assignments/ModerationHeaderSpec.js @@ -25,7 +25,6 @@ import Header from 'jsx/assignments/ModerationHeader' QUnit.module('ModerationHeader', { setup() { this.props = { - anonymousModeratedMarkingEnabled: false, muted: false, onPublishClick() {}, onReviewClick() {}, @@ -153,7 +152,6 @@ QUnit.module('ModerationHeader#unmuteAssignmentButton', (hooks) => { hooks.beforeEach(() => { props = { - anonymousModeratedMarkingEnabled: true, muted: true, onPublishClick() {}, onReviewClick() {}, @@ -179,18 +177,11 @@ QUnit.module('ModerationHeader#unmuteAssignmentButton', (hooks) => { wrapper.unmount() }) - test('renders the unmute button if Anonymous Moderated Marking is enabled', () => { + test('renders the unmute button', () => { renderHeader() strictEqual(wrapper.find(unmuteButtonSelector).exists(), true) }) - test('does not render the unmute button if Anonymous Moderated Marking is not enabled', () => { - props.anonymousModeratedMarkingEnabled = false - - renderHeader() - strictEqual(wrapper.find(unmuteButtonSelector).exists(), false) - }) - test('enables the unmute button if the assignment is published and muted', () => { props.published = true props.muted = true diff --git a/spec/coffeescripts/models/AssignmentSpec.js b/spec/coffeescripts/models/AssignmentSpec.js index b8a93b46d61..c0ec617f77e 100644 --- a/spec/coffeescripts/models/AssignmentSpec.js +++ b/spec/coffeescripts/models/AssignmentSpec.js @@ -1199,7 +1199,6 @@ QUnit.module('Assignment#renderModeratedGradingFormFieldGroup', (hooks) => { hooks.beforeEach(() => { fakeENV.setup({ - ANONYMOUS_MODERATED_MARKING_ENABLED: false, AVAILABLE_MODERATORS: availableModerators, HAS_GRADED_SUBMISSIONS: false, LOCALE: 'en', diff --git a/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js b/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js index dd3298e5238..16d3fd751fe 100644 --- a/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js +++ b/spec/coffeescripts/speed_grader/SpeedgraderHelpersSpec.js @@ -18,7 +18,6 @@ import fakeENV from 'helpers/fakeENV' import SpeedgraderHelpers, { - isAnonymousModeratedMarkingEnabled, setupIsAnonymous, setupAnonymizableId } from 'speed_grader_helpers' @@ -36,10 +35,6 @@ QUnit.module('SpeedGrader', { } }) -test('isAnonymousModeratedMarkingEnabled is available on main object', () => { - strictEqual(SpeedgraderHelpers.isAnonymousModeratedMarkingEnabled, isAnonymousModeratedMarkingEnabled) -}) - test('setupIsAnonymous is available on main object', () => { strictEqual(SpeedgraderHelpers.setupIsAnonymous, setupIsAnonymous) }) @@ -441,56 +436,18 @@ test('Posts to the resubmit URL', () => { $.ajaxJSON = previousAjaxJson }) -QUnit.module('SpeedgraderHelpers.isAnonymousModeratedMarking', suiteHooks => { - suiteHooks.afterEach(() => { - fakeENV.teardown() - }) - - test('returns false when not set', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(isAnonymousModeratedMarkingEnabled(), false) - }) - - test('returns false when disabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: false}) - strictEqual(isAnonymousModeratedMarkingEnabled(), false) - }) - - test('returns true when enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) - strictEqual(isAnonymousModeratedMarkingEnabled(), true) - }) -}) - QUnit.module('SpeedgraderHelpers.setupIsAnonymous', suiteHooks => { suiteHooks.afterEach(() => { fakeENV.teardown() }) - test('returns true when assignment is anonymously graded and Anonymous Moderated Marking is enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) + test('returns true when assignment is anonymously graded', () => { strictEqual(setupIsAnonymous({anonymous_grading: true}), true) }) - test('returns false when assignment is not anonymously graded and Anonymous Moderated Marking is enabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: true}) + test('returns false when assignment is not anonymously graded', () => { strictEqual(setupIsAnonymous({anonymous_grading: false}), false) }) - - test('returns false when assignment is anonymously graded and Anonymous Moderated Marking is disabled', () => { - fakeENV.setup({anonymous_moderated_marking_enabled: false}) - strictEqual(setupIsAnonymous({anonymous_grading: true}), false) - }) - - test('returns false when assignment is not anonymously graded and Anonymous Moderated Marking is unset', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(setupIsAnonymous({anonymous_grading: false}), false) - }) - - test('returns false when assignment is anonymously graded and Anonymous Moderated Marking is unset', () => { - delete ENV.anonymous_moderated_marking_enabled - strictEqual(setupIsAnonymous({anonymous_grading: true}), false) - }) }) QUnit.module('SpeedgraderHelpers.setupAnonymizableId', suiteHooks => { diff --git a/spec/coffeescripts/views/assignments/EditViewSpec.js b/spec/coffeescripts/views/assignments/EditViewSpec.js index 9bf25fac397..d4253f907c1 100644 --- a/spec/coffeescripts/views/assignments/EditViewSpec.js +++ b/spec/coffeescripts/views/assignments/EditViewSpec.js @@ -149,16 +149,7 @@ test('rejects a letter for points_possible', function() { equal(errors.points_possible[0].message, 'Points possible must be a number') }) -test('does not validate presence of a final grader if anonymous moderated marking is disabled', function() { - const view = this.editView() - sinon.spy(view, 'validateFinalGrader') - view.validateBeforeSave({}, []) - strictEqual(view.validateFinalGrader.callCount, 0) - view.validateFinalGrader.restore() -}) - -test('validates presence of a final grader if anonymous moderated marking is enabled', function() { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true +test('validates presence of a final grader', function() { const view = this.editView() sinon.spy(view, 'validateFinalGrader') view.validateBeforeSave({}, []) @@ -166,16 +157,7 @@ test('validates presence of a final grader if anonymous moderated marking is ena view.validateFinalGrader.restore() }) -test('does not validate grader count if anonymous moderated marking is disabled', function() { - const view = this.editView() - sinon.spy(view, 'validateGraderCount') - view.validateBeforeSave({}, []) - strictEqual(view.validateGraderCount.callCount, 0) - view.validateGraderCount.restore() -}) - -test('validates grader count if anonymous moderated marking is enabled', function() { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true +test('validates grader count', function() { const view = this.editView() sinon.spy(view, 'validateGraderCount') view.validateBeforeSave({}, []) @@ -355,22 +337,6 @@ test('renders escaped angle brackets properly', function() { equal(view.$description.val().match(desc), desc) }) -test('allows changing moderation setting if no graded submissions exist', function() { - ENV.HAS_GRADED_SUBMISSIONS = false - const view = this.editView({has_submitted_submissions: true, moderated_grading: true}) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('checked')) - notOk(view.$('[type=checkbox][name=moderated_grading]').prop('disabled')) - equal(view.$('[type=hidden][name=moderated_grading]').attr('value'), '0') -}) - -test('locks down moderation setting after students submit', function() { - ENV.HAS_GRADED_SUBMISSIONS = true - const view = this.editView({has_submitted_submissions: true, moderated_grading: true}) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('checked')) - ok(view.$('[type=checkbox][name=moderated_grading]').prop('disabled')) - equal(view.$('[type=hidden][name=moderated_grading]').attr('value'), '1') -}) - test('routes to discussion details normally', function() { const view = this.editView({html_url: 'http://foo'}) equal(view.locationAfterSave({}), 'http://foo') @@ -1014,18 +980,11 @@ QUnit.module('EditView: Anonymous Moderated Marking', (hooks) => { fixtures.innerHTML = '' }) - test('adds the ModeratedGradingFormFieldGroup mount point when anonymous moderated marking is on', () => { - ENV.ANONYMOUS_MODERATED_MARKING_ENABLED = true + test('adds the ModeratedGradingFormFieldGroup mount point', () => { const view = editView() view.toJSON() strictEqual(view.$el.find('[data-component="ModeratedGradingFormFieldGroup"]').length, 1) }) - - test('does not add the ModeratedGradingFormFieldGroup mount point when anonymous moderated marking is off', () => { - const view = editView() - view.toJSON() - strictEqual(view.$el.find('[data-component="ModeratedGradingFormFieldGroup"]').length, 0) - }) }) QUnit.module('EditView#validateFinalGrader', (hooks) => { diff --git a/spec/controllers/anonymous_submissions_controller_spec.rb b/spec/controllers/anonymous_submissions_controller_spec.rb index c91d942f268..f78c2f29f82 100644 --- a/spec/controllers/anonymous_submissions_controller_spec.rb +++ b/spec/controllers/anonymous_submissions_controller_spec.rb @@ -25,7 +25,6 @@ RSpec.describe AnonymousSubmissionsController do before do course_with_student_and_submitted_homework @context = @course - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(anonymous_grading: true) @submission.update!(score: 10) @assignment.unmute! diff --git a/spec/controllers/assignments_controller_spec.rb b/spec/controllers/assignments_controller_spec.rb index 0e331462128..8d18605e111 100644 --- a/spec/controllers/assignments_controller_spec.rb +++ b/spec/controllers/assignments_controller_spec.rb @@ -218,7 +218,7 @@ describe AssignmentsController do end describe "per-assignment permissions" do - let(:js_permissions) { assigns[:js_env][:PERMISSIONS] } + let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } before(:each) do @course.enable_feature!(:moderated_grading) @@ -230,39 +230,23 @@ describe AssignmentsController do ) user_session(@teacher) + ta_in_course(active_all: true) + + @noneditable_assignment = @course.assignments.create!( + moderated_grading: true, + grader_count: 2, + final_grader: @ta + ) end - context "when Anonymous Moderated Marking is on" do - let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } - - before(:once) do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - - ta_in_course(active_all: true) - - @noneditable_assignment = @course.assignments.create!( - moderated_grading: true, - grader_count: 2, - final_grader: @ta - ) - end - - it "sets the 'update' attribute for an editable assignment to true" do - get 'index', params: {course_id: @course.id} - expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) - end - - it "sets the 'update' attribute for a non-editable assignment to false" do - get 'index', params: {course_id: @course.id} - expect(assignment_permissions[@noneditable_assignment.id][:update]).to eq(false) - end + it "sets the 'update' attribute for an editable assignment to true" do + get 'index', params: {course_id: @course.id} + expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) end - context "when Anonymous Moderated Marking is off" do - it "does not set permissions in js_env for individual assignments" do - get 'index', params: {course_id: @course.id} - expect(js_permissions).not_to include(:by_assignment_id) - end + it "sets the 'update' attribute for a non-editable assignment to false" do + get 'index', params: {course_id: @course.id} + expect(assignment_permissions[@noneditable_assignment.id][:update]).to eq(false) end end end @@ -270,202 +254,115 @@ describe AssignmentsController do describe "GET 'show_moderate'" do before(:each) do user_session(@teacher) - end - - let(:assignment) do - @course.assignments.create( - title: 'some assignment', - workflow_state: 'published', - moderated_grading: true + course_with_user('TeacherEnrollment', {active_all: true, course: @course}) + @other_teacher = @user + @assignment = @course.assignments.create!( + moderated_grading: true, + final_grader: @other_teacher, + grader_count: 2, + workflow_state: 'published' ) end - describe 'js_env for URLS' do - let(:urls) { assigns[:js_env][:URLS] } - - it 'sets student_submissions_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:student_submissions_url]).to eq "http://test.host/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/submissions?include[]=user_summary&include[]=provisional_grades" - end - - it 'sets provisional_grades_base_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:provisional_grades_base_url]).to eq "http://test.host/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/provisional_grades" - end - - it 'sets unmute_assignment_url' do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(urls[:unmute_assignment_url]).to eq "http://test.host/courses/#{@course.id}/assignments/#{assignment.id}/mute?status=false" - end + it "renders the page when the current user is the selected moderator" do + user_session(@other_teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) end - it "sets the js_env for ASSIGNMENT_TITLE" do - get 'show_moderate', params: {course_id: @course.id, assignment_id: assignment.id} - expect(assigns[:js_env][:ASSIGNMENT_TITLE]).to eq "some assignment" + it "renders unauthorized when the current user is not the selected moderator" do + user_session(@teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_unauthorized end - describe 'permissions' do - before(:once) do - @user = User.create! - @custom_role = @course.root_account.roles.create!(name: 'CustomRole', base_role_type: 'TaEnrollment') - @course.root_account.role_overrides.create!(permission: :moderate_grades, role: @custom_role, enabled: true) - @course.root_account.role_overrides.create!(permission: :view_all_grades, role: @custom_role, enabled: false) - @course.root_account.role_overrides.create!(permission: :manage_grades, role: @custom_role, enabled: false) - @course.enroll_user(@user, 'TaEnrollment', role: @custom_role, active_all: true) - @assignment = @course.assignments.create!(workflow_state: 'published', moderated_grading: true) - end - - before(:each) { user_session(@user) } - let(:permissions) { assigns[:js_env][:PERMISSIONS] } - - let(:allow_editing) do - override = @course.root_account.role_overrides.find_by(permission: 'manage_grades') - override.update!(enabled: true) - end - - let(:allow_viewing) do - override = @course.root_account.role_overrides.find_by(permission: 'view_all_grades') - override.update!(enabled: true) - end - - it 'grants the user view permissions if they have "View all grades" permissions in the course' do - allow_viewing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq true - end - - it 'grants the user view permissions if they have "Edit grades" permissions in the course' do - allow_editing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq true - end - - it 'denies the user view permissions if they lack both "View all grades" and "Edit grades" \ - permissions in the course' do - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:view_grades]).to eq false - end - - it 'grants the user edit permissions if they have "Edit grades" permissions in the course' do - allow_editing - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:edit_grades]).to eq true - end - - it 'denies the user edit permissions if they lack "Edit grades" permissions in the course' do - get :show_moderate, params: {course_id: @course, assignment_id: @assignment} - expect(permissions[:edit_grades]).to eq false - end + it "renders unauthorized when no moderator is selected and the user is not an admin" do + @assignment.update!(final_grader: nil) + user_session(@teacher) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(401) end - context "when Anonymous Moderated Grading is enabled" do - before :once do - @course.root_account.enable_feature!(:anonymous_moderated_marking) + it "renders unauthorized when no moderator is selected and the user is an admin without " \ + "'Select Final Grade for Moderation' permission" do + @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) + @assignment.update!(final_grader: nil) + user_session(account_admin_user) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(401) + end + + it "renders the page when the current user is an admin and not the selected moderator" do + account_admin_user(account: @course.root_account) + user_session(@admin) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) + end + + it "renders the page when no moderator is selected and the user is an admin with " \ + "'Select Final Grade for Moderation' permission" do + @assignment.update!(final_grader: nil) + user_session(account_admin_user) + get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} + assert_status(200) + end + + describe "js_env" do + let_once(:grader_1) do course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @other_teacher = @user - @assignment = @course.assignments.create!( + @user + end + let_once(:grader_2) do + course_with_user('TeacherEnrollment', {active_all: true, course: @course}) + @user + end + + let(:env) { assigns[:js_env] } + + before :once do + @assignment.moderation_graders.create!(anonymous_id: "abcde", user: grader_1) + @assignment.moderation_graders.create!(anonymous_id: "fghij", user: grader_2) + end + + before :each do + @assignment.update_attributes( moderated_grading: true, final_grader: @other_teacher, - grader_count: 2, - workflow_state: 'published' + grader_count: 2 ) - end - - it "renders the page when the current user is the selected moderator" do user_session(@other_teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) end - it "renders unauthorized when the current user is not the selected moderator" do - user_session(@teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_unauthorized + it "includes ASSIGNMENT.course_id" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:course_id]).to be(@course.id) end - it "renders unauthorized when no moderator is selected and the user is not an admin" do - @assignment.update!(final_grader: nil) - user_session(@teacher) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(401) + it "includes ASSIGNMENT.id" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:id]).to be(@assignment.id) end - it "renders unauthorized when no moderator is selected and the user is an admin without " \ - "'Select Final Grade for Moderation' permission" do - @course.account.role_overrides.create!(role: admin_role, enabled: false, permission: :select_final_grade) - @assignment.update!(final_grader: nil) - user_session(account_admin_user) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(401) + it "includes ASSIGNMENT.grades_published" do + @assignment.update!(grades_published_at: 1.day.ago) + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:grades_published]).to be(true) end - it "renders the page when the current user is an admin and not the selected moderator" do - account_admin_user(account: @course.root_account) - user_session(@admin) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) + it "includes ASSIGNMENT.muted" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:muted]).to be(true) end - it "renders the page when no moderator is selected and the user is an admin with " \ - "'Select Final Grade for Moderation' permission" do - @assignment.update!(final_grader: nil) - user_session(account_admin_user) - get 'show_moderate', params: {course_id: @course.id, assignment_id: @assignment.id} - assert_status(200) + it "includes ASSIGNMENT.title" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + expect(env[:ASSIGNMENT][:title]).to eql(@assignment.title) end - describe "js_env" do - let_once(:grader_1) do - course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @user - end - let_once(:grader_2) do - course_with_user('TeacherEnrollment', {active_all: true, course: @course}) - @user - end - - let(:env) { assigns[:js_env] } - - before :once do - @assignment.moderation_graders.create!(anonymous_id: "abcde", user: grader_1) - @assignment.moderation_graders.create!(anonymous_id: "fghij", user: grader_2) - end - - before :each do - user_session(@other_teacher) - end - - it "includes ASSIGNMENT.course_id" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:course_id]).to be(@course.id) - end - - it "includes ASSIGNMENT.id" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:id]).to be(@assignment.id) - end - - it "includes ASSIGNMENT.grades_published" do - @assignment.update!(grades_published_at: 1.day.ago) - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:grades_published]).to be(true) - end - - it "includes ASSIGNMENT.muted" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:muted]).to be(true) - end - - it "includes ASSIGNMENT.title" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - expect(env[:ASSIGNMENT][:title]).to eql(@assignment.title) - end - - it "includes moderation graders in GRADERS" do - get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} - moderation_grader_ids = @assignment.moderation_graders.map(&:id) - expect(env[:GRADERS].map {|grader| grader[:id]}).to match_array(moderation_grader_ids) - end + it "includes moderation graders in GRADERS" do + get :show_moderate, params: {course_id: @course.id, assignment_id: @assignment.id} + moderation_grader_ids = @assignment.moderation_graders.map(&:id) + expect(env[:GRADERS].map {|grader| grader[:id]}).to match_array(moderation_grader_ids) end end end @@ -719,18 +616,17 @@ describe AssignmentsController do user_session(@teacher) end - context "with anonymous moderated marking enabled and moderated grading on" do + context "with moderated grading on" do before :each do - @course.account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(moderated_grading: true, grader_count: 1) end - it "should fail if anonymous_moderated_marking is enabled, grades are not published, and status is false" do + it "should fail if grades are not published, and status is false" do put 'toggle_mute', params: { course_id: @course.id, assignment_id: @assignment.id, status: false }, format: 'json' assert_unauthorized end - it "should mute if anonymous_moderated_marking is enabled, grades are not published, and status is true" do + it "should mute if grades are not published, and status is true" do @assignment.update!(muted: false) put 'toggle_mute', params: { course_id: @course.id, assignment_id: @assignment.id, status: true }, format: 'json' @assignment.reload @@ -893,7 +789,7 @@ describe AssignmentsController do let(:request_params) { [:edit, params: {course_id: course, id: @assignment}] } end - shared_examples 'course feature flag made available by Anonymous Moderated Marking account flag' do + shared_examples 'course feature flags for Anonymous Moderated Marking' do before(:each) do user_session(@teacher) end @@ -904,30 +800,11 @@ describe AssignmentsController do expect(assigns[:js_env][js_env_attribute]).to be false end - it 'is false when the feature flag is enabled' do + it 'is true when the feature flag is enabled' do @course.enable_feature!(feature_flag) get 'edit', params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][js_env_attribute]).to be false - end - - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - @course.account.enable_feature!(:anonymous_moderated_marking) - end - - it 'is false when the feature flag is not enabled' do - get 'edit', params: { course_id: @course.id, id: @assignment.id } - - expect(assigns[:js_env][js_env_attribute]).to be false - end - - it 'is true when the feature flag is enabled' do - @course.enable_feature!(feature_flag) - get 'edit', params: { course_id: @course.id, id: @assignment.id } - - expect(assigns[:js_env][js_env_attribute]).to be true - end + expect(assigns[:js_env][js_env_attribute]).to be true end end @@ -983,26 +860,8 @@ describe AssignmentsController do expect(assigns[:js_env][:SIS_NAME]).to eq('Foo Bar') end - describe 'js_env ANONYMOUS_MODERATED_MARKING_ENABLED' do - before(:each) do - user_session(@teacher) - end - - it 'is true when the root account has Anonymous Moderated Marking enabled' do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :edit, params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][:ANONYMOUS_MODERATED_MARKING_ENABLED]).to be true - end - - it 'is false when the root account does not have Anonymous Moderated Marking enabled' do - get :edit, params: { course_id: @course.id, id: @assignment.id } - expect(assigns[:js_env][:ANONYMOUS_MODERATED_MARKING_ENABLED]).to be false - end - end - it 'js_env AVAILABLE_MODERATORS includes the name and id for each available moderator' do user_session(@teacher) - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment.update!(grader_count: 2, moderated_grading: true) get :edit, params: { course_id: @course.id, id: @assignment.id } expected_moderators = @course.instructors.map { |user| { name: user.name, id: user.id } } @@ -1111,14 +970,14 @@ describe AssignmentsController do end describe 'js_env ANONYMOUS_GRADING_ENABLED' do - it_behaves_like 'course feature flag made available by Anonymous Moderated Marking account flag' do + it_behaves_like 'course feature flags for Anonymous Moderated Marking' do let(:js_env_attribute) { :ANONYMOUS_GRADING_ENABLED } let(:feature_flag) { :anonymous_marking } end end describe 'js_env MODERATED_GRADING_ENABLED' do - it_behaves_like 'course feature flag made available by Anonymous Moderated Marking account flag' do + it_behaves_like 'course feature flags for Anonymous Moderated Marking' do let(:js_env_attribute) { :MODERATED_GRADING_ENABLED } let(:feature_flag) { :moderated_grading } end diff --git a/spec/controllers/canvadoc_sessions_controller_spec.rb b/spec/controllers/canvadoc_sessions_controller_spec.rb index cf1fbd4659e..8ef1bb800b1 100644 --- a/spec/controllers/canvadoc_sessions_controller_spec.rb +++ b/spec/controllers/canvadoc_sessions_controller_spec.rb @@ -203,9 +203,7 @@ describe CanvadocSessionsController do end let(:hmac) { Canvas::Security.hmac_sha1(blob.to_json) } - it "disables submission annotations for an anonymously-graded assignment " \ - "when Anonymous Moderated Marking is enabled" do - @course.root_account.enable_feature!(:anonymous_moderated_marking) + it "disables submission annotations for an anonymously-graded assignment" do @assignment.update!(anonymous_grading: true) # The controller fetches different instances of the model objects we're # working with here, so unfortunately we can't mock them specifically. @@ -215,9 +213,8 @@ describe CanvadocSessionsController do get :show, params: {blob: blob.to_json, hmac: hmac} end - it "enables submission annotations for an anonymously-graded assignment " \ - "when Anonymous Moderated Marking is disabled" do - @assignment.update!(anonymous_grading: true) + it "enables submission annotations for a non-anonymously-graded assignment" do + @assignment.update!(anonymous_grading: false) # The controller fetches different instances of the model objects we're # working with here, so unfortunately we can't mock them specifically. expect_any_instance_of(Canvadoc).to receive(:session_url). diff --git a/spec/controllers/courses_controller_spec.rb b/spec/controllers/courses_controller_spec.rb index 378a6f5105f..e1ca5300398 100644 --- a/spec/controllers/courses_controller_spec.rb +++ b/spec/controllers/courses_controller_spec.rb @@ -488,38 +488,25 @@ describe CoursesController do grader_count: 2, final_grader: @teacher ) + + ta_in_course(active_all: true) + @uneditable_assignment = @course.assignments.create!( + moderated_grading: true, + grader_count: 2, + final_grader: @ta + ) end - context "when Anonymous Moderated Marking is on" do - let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } + let(:assignment_permissions) { assigns[:js_env][:PERMISSIONS][:by_assignment_id] } - before(:each) do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - - ta_in_course(active_all: true) - @uneditable_assignment = @course.assignments.create!( - moderated_grading: true, - grader_count: 2, - final_grader: @ta - ) - end - - it "sets the 'update' attribute for an editable assignment to true" do - get 'show', params: {id: @course.id} - expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) - end - - it "sets the 'update' attribute for an uneditable assignment to false" do - get 'show', params: {id: @course.id} - expect(assignment_permissions[@uneditable_assignment.id][:update]).to eq(false) - end + it "sets the 'update' attribute for an editable assignment to true" do + get 'show', params: {id: @course.id} + expect(assignment_permissions[@editable_assignment.id][:update]).to eq(true) end - context "when Anonymous Moderated Marking is off" do - it "does not set permissions in js_env for individual assignments" do - get 'show', params: {id: @course.id} - expect(js_permissions).not_to include(:by_assignment_id) - end + it "sets the 'update' attribute for an uneditable assignment to false" do + get 'show', params: {id: @course.id} + expect(assignment_permissions[@uneditable_assignment.id][:update]).to eq(false) end end end @@ -2378,11 +2365,11 @@ describe CoursesController do user_session(@teacher) post 'student_view', params: {course_id: @course.id} test_student = @course.student_view_student - assignment = @course.assignments.create!(:workflow_state => 'published', :moderated_grading => true) + assignment = @course.assignments.create!(workflow_state: 'published', moderated_grading: true, grader_count: 2) assignment.grade_student test_student, { :grade => 1, :grader => @teacher, :provisional => true } file = assignment.attachments.create! uploaded_data: default_uploaded_data assignment.submissions.first.add_comment(commenter: @teacher, message: 'blah', provisional: true, attachments: [file]) - assignment.moderated_grading_selections.create!(:student => test_student, :provisional_grade => ModeratedGrading::ProvisionalGrade.last) + assignment.moderated_grading_selections.where(student: test_student).first.update_attribute(:provisional_grade, ModeratedGrading::ProvisionalGrade.last) expect(test_student.submissions.size).not_to be_zero delete 'reset_test_student', params: {course_id: @course.id} diff --git a/spec/controllers/gradebooks_controller_spec.rb b/spec/controllers/gradebooks_controller_spec.rb index 697261e037f..fab92c1f2b9 100644 --- a/spec/controllers/gradebooks_controller_spec.rb +++ b/spec/controllers/gradebooks_controller_spec.rb @@ -741,19 +741,6 @@ describe GradebooksController do end end - it "includes anonymous_moderated_marking_enabled for Old Gradebook" do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :show, params: { course_id: @course.id } - expect(gradebook_options.fetch(:anonymous_moderated_marking_enabled)).to eq(true) - end - - it "includes anonymous_moderated_marking_enabled for New Gradebook" do - @course.enable_feature!(:new_gradebook) - @course.root_account.enable_feature!(:anonymous_moderated_marking) - get :show, params: { course_id: @course.id } - expect(gradebook_options.fetch(:anonymous_moderated_marking_enabled)).to eq(true) - end - it "includes colors if New Gradebook is enabled" do @course.enable_feature!(:new_gradebook) get :show, params: {course_id: @course.id} @@ -1285,10 +1272,6 @@ describe GradebooksController do end describe 'anonymous assignment' do - before :once do - @course.root_account.enable_feature!(:anonymous_moderated_marking) - end - it 'works with the absense of user_id and the presence of anonymous_id' do user_session(@teacher) @assignment.update!(anonymous_grading: true) @@ -1413,7 +1396,7 @@ describe GradebooksController do context "moderated grading" do before :once do - @assignment = @course.assignments.create!(:title => "some assignment", :moderated_grading => true) + @assignment = @course.assignments.create!(title: "some assignment", moderated_grading: true, grader_count: 1) @student = @course.enroll_student(User.create!(:name => "some user"), :enrollment_state => :active).user end @@ -1483,16 +1466,16 @@ describe GradebooksController do expect(pg.graded_anonymously).to eq false end - it "doesn't create a provisional grade when the student has one already (and isn't in the moderation set)" do - submission = @assignment.submit_homework(@student, :body => "hello") + it "doesn't create a provisional grade when the student has one already" do + @assignment.submit_homework(@student, :body => "hello") other_teacher = teacher_in_course(:course => @course, :active_all => true).user - submission.find_or_create_provisional_grade!(other_teacher) + @assignment.grade_student(@student, grade: 2, grader: other_teacher, provisional: true) post 'update_submission', params: {:course_id => @course.id, :submission => { :score => 100, :comment => "provisional!", :assignment_id => @assignment.id, :user_id => @student.id, :provisional => true }}, :format => :json expect(response).to_not be_success - expect(response.body).to include("Student already has the maximum number of provisional grades") + expect(response.body).to include("The maximum number of graders has been reached for this assignment") end it "should create a provisional grade even if the student has one but is in the moderation set" do @@ -1500,8 +1483,6 @@ describe GradebooksController do other_teacher = teacher_in_course(:course => @course, :active_all => true).user submission.find_or_create_provisional_grade!(other_teacher) - @assignment.moderated_grading_selections.create!(:student => @student) - post 'update_submission', params: {:course_id => @course.id, :submission => { :score => 100, :comment => "provisional!", :assignment_id => @assignment.id, :user_id => @student.id, :provisional => true }}, :format => :json @@ -1547,11 +1528,10 @@ describe GradebooksController do end end - describe 'provisional grade error handling for Anonymous Moderated Marking' do + describe 'provisional grade error handling' do before(:once) do course_with_student(active_all: true) teacher_in_course(active_all: true) - @course.root_account.enable_feature!(:anonymous_moderated_marking) @assignment = @course.assignments.create!( title: 'yet another assignment', @@ -1653,20 +1633,14 @@ describe GradebooksController do expect(assigns[:disable_unmute_assignment]).to eq false end - it 'sets disable_unmute_assignment to false if anonymous moderated marking is disabled' do - get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} - expect(assigns[:disable_unmute_assignment]).to eq false - end - it 'sets disable_unmute_assignment to false if assignment grades have been published' do @assignment.update!(grades_published_at: Time.zone.now) get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} expect(assigns[:disable_unmute_assignment]).to eq false end - it 'sets disable_unmute_assignment to true if assignment muted, anonymous moderated marking enabled, and grades not published' do + it 'sets disable_unmute_assignment to true if assignment muted and grades not published' do @assignment.update!(muted: true, grades_published_at: nil, moderated_grading: true, grader_count: 1) - @assignment.root_account.enable_feature!(:anonymous_moderated_marking) get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id} expect(assigns[:disable_unmute_assignment]).to eq true end diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb index f957b573e7b..e32794fa346 100644 --- a/spec/controllers/submissions_controller_spec.rb +++ b/spec/controllers/submissions_controller_spec.rb @@ -543,47 +543,41 @@ describe SubmissionsController do expect(body['published_score']).to be nil end - context "for an assignment that has anonymous grading and muted with anonymous_moderated_marking enabled" do - before :each do - @assignment.root_account.enable_feature!(:anonymous_moderated_marking) - end + it "renders the page for submitting student" do + user_session(@student) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_status(200) + end - it "renders the page for submitting student" do - user_session(@student) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_status(200) - end + it "renders unauthorized for non-submitting student" do + new_student = User.create! + @context.enroll_student(new_student, enrollment_state: 'active') + user_session(new_student) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for non-submitting student" do - new_student = User.create! - @context.enroll_student(new_student, enrollment_state: 'active') - user_session(new_student) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end + it "renders unauthorized for teacher" do + user_session(@teacher) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for teacher" do - user_session(@teacher) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end + it "renders unauthorized for admin" do + user_session(account_admin_user) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_unauthorized + end - it "renders unauthorized for admin" do - user_session(account_admin_user) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_unauthorized - end - - it "renders the page for site admin" do - user_session(site_admin_user) - @assignment.update!(anonymous_grading: true, muted: true) - get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} - assert_status(200) - end + it "renders the page for site admin" do + user_session(site_admin_user) + @assignment.update!(anonymous_grading: true, muted: true) + get :show, params: {course_id: @context.id, assignment_id: @assignment.id, id: @student.id} + assert_status(200) end context "with user id not present in course" do diff --git a/spec/helpers/gradebooks_helper_spec.rb b/spec/helpers/gradebooks_helper_spec.rb index fcd7f486030..7483760a490 100644 --- a/spec/helpers/gradebooks_helper_spec.rb +++ b/spec/helpers/gradebooks_helper_spec.rb @@ -56,44 +56,6 @@ describe GradebooksHelper do end end - describe '#anonymous_grading_required?' do - it 'returns false by default' do - assignment = assignment_model - expect(helper.anonymous_grading_required?(assignment)).to eq false - end - - it 'returns true if course setting is on' do - assignment = assignment_model - assignment.context.enable_feature!(:anonymous_grading) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if sub-account setting is on' do - root_account = Account.default - sub_account = root_account.sub_accounts.create! - sub_account.enable_feature!(:anonymous_grading) - sub_account_course = course_model(account: sub_account) - assignment = assignment_model(course: sub_account_course) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if root account setting is on' do - root_account = Account.default - root_account.enable_feature!(:anonymous_grading) - sub_account = root_account.sub_accounts.create! - sub_account_course = course_model(account: sub_account) - assignment = assignment_model(course: sub_account_course) - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - - it 'returns true if site admin setting is on' do - site_admin_account = Account.site_admin - site_admin_account.enable_feature!(:anonymous_grading) - assignment = assignment_model - expect(helper.anonymous_grading_required?(assignment)).to eq true - end - end - describe '#force_anonymous_grading?' do it 'returns false by default' do expect(helper.force_anonymous_grading?(assignment_model)).to eq false @@ -104,26 +66,15 @@ describe GradebooksHelper do expect(helper.force_anonymous_grading?(assignment)).to eq true end - it 'returns true if anonymous grading flag set' do - Account.default.enable_feature!(:anonymous_grading) - expect(helper.force_anonymous_grading?(assignment_model)).to eq true + it 'returns true for an anonymously-graded assignment' do + assignment = assignment_model + assignment.anonymous_grading = true + expect(helper.force_anonymous_grading?(assignment)).to eq true end - context 'when Anonymous Moderated Marking is enabled' do - before(:once) do - Account.default.enable_feature!(:anonymous_moderated_marking) - end - - it 'returns true for an anonymously-graded assignment' do - assignment = assignment_model - assignment.anonymous_grading = true - expect(helper.force_anonymous_grading?(assignment)).to eq true - end - - it 'returns false for a non-anonymously-graded assignment' do - assignment = assignment_model - expect(helper.force_anonymous_grading?(assignment)).to eq false - end + it 'returns false for a non-anonymously-graded assignment' do + assignment = assignment_model + expect(helper.force_anonymous_grading?(assignment)).to eq false end end @@ -138,8 +89,9 @@ describe GradebooksHelper do end it 'returns anonymous grading' do - Account.default.enable_feature!(:anonymous_grading) - expect(helper.force_anonymous_grading_reason(assignment_model)).to match(/anonymous grading/) + assignment = assignment_model + assignment.anonymous_grading = true + expect(helper.force_anonymous_grading_reason(assignment)).to match(/anonymous grading/) end end diff --git a/spec/integration/assignments_spec.rb b/spec/integration/assignments_spec.rb index c76a8a40b06..d71843e8bc5 100644 --- a/spec/integration/assignments_spec.rb +++ b/spec/integration/assignments_spec.rb @@ -309,7 +309,7 @@ describe "ratio of submissions graded" do let(:moderate_button) { Nokogiri::HTML(response.body).at_css('#moderated_grading_button') } it 'shows the moderation link for moderated assignments' do - @assignment.update!(moderated_grading: true) + @assignment.update!(moderated_grading: true, grader_count: 1, final_grader: @teacher) get "/courses/#{@course.id}/assignments/#{@assignment.id}" expect(moderate_button).not_to be_nil diff --git a/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js b/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js index 34bdd3ab667..ffe4a21f4df 100644 --- a/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js +++ b/spec/javascripts/jsx/gradebook/SubmissionStateMapGradeVisibilitySpec.js @@ -50,25 +50,25 @@ define([ // time this is being written a significant amount of work is needed // to be able to require javascript files that live in the spec directory - QUnit.module('SubmissionStateMap with anonymous moderated marking enabled'); + QUnit.module('SubmissionStateMap'); test ('submission has grade visible if not anonymous', function() { const assignment = { id: '1', muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, false); }); test ('submission has grade visible if not muted', function() { const assignment = { id: '1', anonymous_grading: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, false); }); test ('submission has grade hidden if anonymous and muted', function() { const assignment = { id: '1', anonymous_grading: true, muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.hideGrade, true); }); diff --git a/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js b/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js index bbf0f3433b5..f4b84c91bdd 100644 --- a/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js +++ b/spec/javascripts/jsx/gradebook/SubmissionStateMapLockingSpec.js @@ -50,25 +50,25 @@ define([ // time this is being written a significant amount of work is needed // to be able to require javascript files that live in the spec directory - QUnit.module('SubmissionStateMap with anonymous moderated marking enabled'); + QUnit.module('SubmissionStateMap'); test ('submission is unlocked if not anonymous', function() { const assignment = { id: '1', muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, false); }); test ('submission is unlocked if not muted', function() { const assignment = { id: '1', anonymous_grading: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, false); }); test ('submission is locked if anonymous and muted', function() { const assignment = { id: '1', anonymous_grading: true, muted: true }; - const map = createAndSetupMap(assignment, { anonymousModeratedMarkingEnabled: true }); + const map = createAndSetupMap(assignment); const state = map.getSubmissionState({ user_id: student.id, assignment_id: assignment.id }); strictEqual(state.locked, true); }); diff --git a/spec/javascripts/jsx/gradezilla/GradebookSpec.js b/spec/javascripts/jsx/gradezilla/GradebookSpec.js index ac2e1388ed2..eb774097bce 100644 --- a/spec/javascripts/jsx/gradezilla/GradebookSpec.js +++ b/spec/javascripts/jsx/gradezilla/GradebookSpec.js @@ -6198,18 +6198,6 @@ test('sets the submission state map .isAdmin when the current user roles do not strictEqual(gradebook.submissionStateMap.isAdmin, false); }); -test('sets submission state map .anonymousModeratedMarkingEnabled when anonymous moderated marking flag is set', function () { - const gradebook = createGradebook({ anonymous_moderated_marking_enabled: true }); - gradebook.initSubmissionStateMap(); - strictEqual(gradebook.submissionStateMap.anonymousModeratedMarkingEnabled, true); -}); - -test('sets submission state map .anonymousModeratedMarkingEnabled to false when anonymous moderated marking flag is reset', function () { - const gradebook = createGradebook({ anonymous_moderated_marking_enabled: false }); - gradebook.initSubmissionStateMap(); - strictEqual(gradebook.submissionStateMap.anonymousModeratedMarkingEnabled, false); -}); - QUnit.module('Gradebook#initPostGradesLtis'); test('sets postGradesLtis as an array', function () { @@ -6973,19 +6961,6 @@ QUnit.module('Gradebook#getSubmissionTrayProps', function(suiteHooks) { moxios.uninstall(); }); - test('anonymousModeratedMarkingEnabled is true when options.anonymous_moderated_marking_enabled is true', function () { - gradebook.options.anonymous_moderated_marking_enabled = true - gradebook.setSubmissionTrayState(true, '1101', '2301'); - const props = gradebook.getSubmissionTrayProps(gradebook.student('1101')); - strictEqual(props.anonymousModeratedMarkingEnabled, true); - }); - - test('anonymousModeratedMarkingEnabled is false when options.anonymous_moderated_marking_enabled is false', function () { - gradebook.setSubmissionTrayState(true, '1101', '2301'); - const props = gradebook.getSubmissionTrayProps(gradebook.student('1101')); - strictEqual(props.anonymousModeratedMarkingEnabled, false); - }); - test('gradingDisabled is true when the submission state is locked', function () { sinon.stub(gradebook.submissionStateMap, 'getSubmissionState').returns({ locked: true }); gradebook.setSubmissionTrayState(true, '1101', '2301'); diff --git a/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js b/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js index 60f898c7bd9..c40f535d578 100644 --- a/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js +++ b/spec/javascripts/jsx/gradezilla/SubmissionStateMapSpec.js @@ -39,8 +39,7 @@ function createMap (opts = {}) { const defaults = { hasGradingPeriods: false, selectedGradingPeriodID: '0', - isAdmin: false, - anonymousModeratedMarkingEnabled: false + isAdmin: false }; const params = { ...defaults, ...opts }; @@ -122,123 +121,121 @@ QUnit.module('#setSubmissionCellState', function() { strictEqual(submission.hideGrade, false); }); - QUnit.module('anonymous moderated marking enabled', function() { - test('the submission state is locked when the student is not assigned', function() { - const assignment = { - id: '1', - published: true, - only_visible_to_overrides: true, - assignment_visibility: ['2'] - } - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) + test('the submission state is locked when the student is not assigned', function() { + const assignment = { + id: '1', + published: true, + only_visible_to_overrides: true, + assignment_visibility: ['2'] + } + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.locked, true) + }) + + test('the submission state is not locked if not moderated grading', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, false); + }); + + test('the submission state has hideGrade not set if not moderated grading', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + test('the submission state is not locked if moderated grading and grades published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: true + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, false); + }); + + test('the submission state has hideGrade not set if moderated grading and grades published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: true + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + test('the submission state is locked if moderated grading and grades not published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.locked, true); + }); + + test('the submission state has hideGrade not set if moderated grading and grades not published', function() { + const assignment = { + id: '1', + published: true, + moderated_grading: true, + grades_published: false + }; + const map = createAndSetupMap(assignment, studentWithSubmission); + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); + strictEqual(submission.hideGrade, false); + }); + + QUnit.module('when the assignment is anonymous', function(hooks) { + let assignment + + hooks.beforeEach(() => { + assignment = { id: '1', published: true, anonymous_grading: true } + }) + + test('the submission state is locked when the assignment is muted', function() { + assignment.muted = true + const map = createAndSetupMap(assignment, studentWithSubmission) const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) strictEqual(submission.locked, true) }) - test('the submission state is not locked if not moderated grading', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, false); - }); - - test('the submission state has hideGrade not set if not moderated grading', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - test('the submission state is not locked if moderated grading and grades published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: true - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, false); - }); - - test('the submission state has hideGrade not set if moderated grading and grades published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: true - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - test('the submission state is locked if moderated grading and grades not published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.locked, true); - }); - - test('the submission state has hideGrade not set if moderated grading and grades not published', function() { - const assignment = { - id: '1', - published: true, - moderated_grading: true, - grades_published: false - }; - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }); - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }); - strictEqual(submission.hideGrade, false); - }); - - QUnit.module('when the assignment is anonymous', function(hooks) { - let assignment - - hooks.beforeEach(() => { - assignment = { id: '1', published: true, anonymous_grading: true } - }) - - test('the submission state is locked when the assignment is muted', function() { - assignment.muted = true - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.locked, true) - }) - - test('the submission state is hidden when the assignment is muted', function() { - assignment.muted = true - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.hideGrade, true) - }) - - test('the submission state is unlocked when the assignment is unmuted', function() { - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.locked, false) - }) - - test('the submission state is not hidden when the assignment is unmuted', function() { - const map = createAndSetupMap(assignment, studentWithSubmission, { anonymousModeratedMarkingEnabled: true }) - const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) - strictEqual(submission.hideGrade, false) - }) + test('the submission state is hidden when the assignment is muted', function() { + assignment.muted = true + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.hideGrade, true) }) - }); + + test('the submission state is unlocked when the assignment is unmuted', function() { + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.locked, false) + }) + + test('the submission state is not hidden when the assignment is unmuted', function() { + const map = createAndSetupMap(assignment, studentWithSubmission) + const submission = map.getSubmissionState({ user_id: studentWithSubmission.id, assignment_id: assignment.id }) + strictEqual(submission.hideGrade, false) + }) + }) QUnit.module('no submission', function() { test('the submission object is missing if the assignment is late', function () { diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js index 31c6e74ea0e..b147d0f84b0 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookGrid/headers/AssignmentColumnHeaderRendererSpec.js @@ -173,11 +173,10 @@ QUnit.module('AssignmentColumnHeaderRenderer', function (suiteHooks) { equal(component.props.downloadSubmissionsAction, gradebook.getDownloadSubmissionsAction.returnValues[0]); }); - test('the anonymousGrading prop is `false` when the assignment is anonymous', function () { + test('the anonymousGrading prop is `true` when the assignment is anonymous', function () { assignment.anonymous_grading = true render() - // anonymousGrading can only be true if Anonymous Moderated Marking is enabled - strictEqual(component.props.assignment.anonymousGrading, false) + strictEqual(component.props.assignment.anonymousGrading, true) }) test('the anonymousGrading prop is `false` when the assignment is not anonymous', function () { @@ -505,23 +504,6 @@ QUnit.module('AssignmentColumnHeaderRenderer', function (suiteHooks) { render(); equal(component.props.sortBySetting.settingKey, 'grade'); }); - - QUnit.module('when Anonymous Moderated Marking is enabled', function (hooks) { - hooks.beforeEach(() => { - gradebook.options.anonymous_moderated_marking_enabled = true - }) - - test('the anonymousGrading prop is `true` when the assignment is anonymous', function () { - assignment.anonymous_grading = true - render() - strictEqual(component.props.assignment.anonymousGrading, true) - }) - - test('the anonymousGrading prop is `false` when the assignment is not anonymous', function () { - render() - strictEqual(component.props.assignment.anonymousGrading, false) - }) - }) }); QUnit.module('#destroy', function () { diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js index a3474976c04..5b865377fd8 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/GradebookSpecHelper.js @@ -20,7 +20,6 @@ import Gradebook from 'compiled/gradezilla/Gradebook'; export function createGradebook (options = {}) { const gradebook = new Gradebook({ - anonymous_moderated_marking_enabled: false, colors: {}, context_allows_gradebook_uploads: true, context_id: '1', diff --git a/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js b/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js index 108f760b7a0..f0b2c7f3731 100644 --- a/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js +++ b/spec/javascripts/jsx/gradezilla/default_gradebook/components/SubmissionTraySpec.js @@ -42,7 +42,6 @@ QUnit.module('SubmissionTray', function (hooks) { }); const defaultProps = { - anonymousModeratedMarkingEnabled: false, contentRef (ref) { content = ref; }, @@ -202,10 +201,8 @@ QUnit.module('SubmissionTray', function (hooks) { strictEqual(speedGraderLink, speedGraderUrl); }); - test('invokes "onAnonymousSpeedGraderClick" when the SpeedGrader link is clicked ' + - 'if the assignment is anonymous and Anonymous Moderated Marking is enabled', function () { + test('invokes "onAnonymousSpeedGraderClick" when the SpeedGrader link is clicked if the assignment is anonymous', function () { const props = { - anonymousModeratedMarkingEnabled: true, assignment: { name: 'Book Report', gradingType: 'points', @@ -221,18 +218,10 @@ QUnit.module('SubmissionTray', function (hooks) { strictEqual(props.onAnonymousSpeedGraderClick.callCount, 1) }) - test('omits student_id from SpeedGrader link if enabled and assignment is ' + - 'anonymously graded and anonymous moderated marking is enabled', function() { - mountComponent({anonymousModeratedMarkingEnabled: true, assignment: {anonymousGrading: true}}); - const speedGraderLink = document.querySelector('.SubmissionTray__Container a[href*="speed_grader"]').getAttribute('href'); - notOk(speedGraderLink.match(/student_id/)) - }); - - test('includes student_id in the SpeedGrader link if enabled and assignment is ' + - 'anonymously graded and anonymous moderated marking is disabled', function() { + test('omits student_id from SpeedGrader link if enabled and assignment is anonymously graded', function() { mountComponent({assignment: {anonymousGrading: true}}); const speedGraderLink = document.querySelector('.SubmissionTray__Container a[href*="speed_grader"]').getAttribute('href'); - ok(speedGraderLink.match(/student_id/)) + notOk(speedGraderLink.match(/student_id/)) }); test('does not show SpeedGrader link if disabled', function () { diff --git a/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js b/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js index 508aebe1828..6261b7da534 100644 --- a/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js +++ b/spec/javascripts/jsx/gradezilla/shared/AssignmentMuterDialogManagerSpec.js @@ -24,11 +24,9 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { let assignment let submissionsLoaded - let anonymousModeratedMarkingEnabled suiteHooks.beforeEach(() => { - anonymousModeratedMarkingEnabled = false - assignment = {moderated_grading: false, grades_published: true, muted: true} + assignment = {anonymous_grading: false, grades_published: true, muted: true} submissionsLoaded = false }) @@ -36,8 +34,7 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { return new AssignmentMuterDialogManager( assignment, url, - submissionsLoaded, - anonymousModeratedMarkingEnabled + submissionsLoaded ) } @@ -95,23 +92,13 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns false when the assignment is moderated and grades have not been published', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = false assignment.moderated_grading = true submissionsLoaded = true strictEqual(createManager().isDialogEnabled(), false) }) - test('returns true for moderated assignments when Anonymous Moderated Marking is disabled', () => { - anonymousModeratedMarkingEnabled = false - assignment.grades_published = false - assignment.moderated_grading = true - submissionsLoaded = true - strictEqual(createManager().isDialogEnabled(), true) - }) - test('returns true for moderated assignments when grades have been published', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = true assignment.moderated_grading = true submissionsLoaded = true @@ -119,7 +106,6 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns true for moderated assignments when not muted', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = false assignment.moderated_grading = true assignment.muted = false @@ -128,7 +114,6 @@ QUnit.module('AssignmentMuterDialogManager', suiteHooks => { }) test('returns true for assignments when not moderated', () => { - anonymousModeratedMarkingEnabled = true assignment.grades_published = true assignment.moderated_grading = false submissionsLoaded = true diff --git a/spec/javascripts/jsx/speed_graderSpec.js b/spec/javascripts/jsx/speed_graderSpec.js index 57e896cfe84..63b05b71d83 100644 --- a/spec/javascripts/jsx/speed_graderSpec.js +++ b/spec/javascripts/jsx/speed_graderSpec.js @@ -34,7 +34,14 @@ let $div QUnit.module('SpeedGrader#showDiscussion', { setup () { - fakeENV.setup(); + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) + fixtures.innerHTML = '' this.stub($, 'ajaxJSON'); this.spy($.fn, 'append'); this.originalWindowJSONData = window.jsonData; @@ -89,6 +96,7 @@ QUnit.module('SpeedGrader#showDiscussion', { $.getJSON.restore() SpeedGrader.EG.currentStudent = this.originalStudent; window.jsonData = this.originalWindowJSONData; + fixtures.innerHTML = '' fakeENV.teardown(); } }); @@ -116,7 +124,14 @@ test('showDiscussion should show private comments for non group assignments', () QUnit.module('SpeedGrader#refreshSubmissionToView', { setup () { - fakeENV.setup(); + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) + fixtures.innerHTML = '' this.stub($, 'ajaxJSON'); this.spy($.fn, 'append'); this.originalWindowJSONData = window.jsonData; @@ -155,6 +170,7 @@ QUnit.module('SpeedGrader#refreshSubmissionToView', { $.getJSON.restore() window.jsonData = this.originalWindowJSONData; SpeedGrader.EG.currentStudent = this.originalStudent; + fixtures.innerHTML = '' fakeENV.teardown(); } }) @@ -169,7 +185,13 @@ QUnit.module('#showSubmissionDetails', function(hooks) { let originalStudent hooks.beforeEach(function() { - fakeENV.setup() + fakeENV.setup({ + assignment_id: '17', + course_id: '29', + grading_role: 'moderator', + help_url: 'example.com/support', + show_help_menu_item: false + }) sinon.stub(SpeedGrader.EG, 'handleSubmissionSelectionChange') originalWindowJSONData = window.jsonData window.jsonData = { @@ -183,7 +205,10 @@ QUnit.module('#showSubmissionDetails', function(hooks) { submission_state: 'not_graded', submission: { score: 7, grade: 70, submission_history: [] } } - fixtures.innerHTML = '
Submission Details
'
+ fixtures.innerHTML = `
+
+ Submission Details
+ `
sinon.stub($, 'getJSON')
sinon.stub($, 'ajaxJSON')
sinon.stub(SpeedGrader.EG, 'domReady')
@@ -476,11 +501,18 @@ test('Does not error out if a user has no submission', function () {
QUnit.module('SpeedGrader#handleGradeSubmit', {
setup () {
- fakeENV.setup();
+ fakeENV.setup({
+ assignment_id: '17',
+ course_id: '29',
+ grading_role: 'moderator',
+ help_url: 'example.com/support',
+ show_help_menu_item: false
+ })
this.stub($, 'ajaxJSON');
this.spy($.fn, 'append');
this.originalWindowJSONData = window.jsonData;
fixtures.innerHTML = `
+
`
@@ -624,7 +656,10 @@ QUnit.module('loading a submission Preview', {
setup() {
fakeENV.setup();
this.stub($, 'ajaxJSON');
- fixtures.innerHTML = 'not empty
'
+ fixtures.innerHTML = `
+
+ not empty
+ `
},
teardown() {
@@ -685,9 +720,18 @@ test('clears the contents of the iframe_holder', () => {
QUnit.module('renderLtiLaunch', {
setup() {
- fakeENV.setup();
- $div = $("not empty
")
- fixtures.innerHTML = $div
+ fakeENV.setup({
+ assignment_id: '17',
+ course_id: '29',
+ grading_role: 'moderator',
+ help_url: 'example.com/support',
+ show_help_menu_item: false
+ })
+ fixtures.innerHTML = `
+
+ not empty
+ `
+ $div = $(fixtures).find('#iframe_holder')
sinon.stub($, 'getJSON')
sinon.stub($, 'ajaxJSON')
sinon.stub(SpeedGrader.EG, 'domReady')
@@ -1099,14 +1143,23 @@ test('compares student sortable names when given function returns equal values f
QUnit.module('SpeedGrader - gateway timeout', {
setup () {
- fakeENV.setup();
+ fakeENV.setup({
+ assignment_id: '17',
+ course_id: '29',
+ grading_role: 'moderator',
+ help_url: 'example.com/support',
+ show_help_menu_item: false
+ })
this.server = sinon.fakeServer.create({ respondImmediately: true });
this.server.respondWith(
'GET',
`${window.location.pathname}.json${window.location.search}`,
[504, { 'Content-Type': 'application/json' }, '']
);
- fixtures.innerHTML = ''
+ fixtures.innerHTML = `
+
+
+ `
},
teardown () {
fixtures.innerHTML = ''
@@ -1170,7 +1223,6 @@ QUnit.module('SpeedGrader - clicking save rubric button for an anonymous assignm
sinon.stub($, 'ajaxJSON');
disableWhileLoadingStub = sinon.stub($.fn, 'disableWhileLoading');
fakeENV.setup({
- anonymous_moderated_marking_enabled: true,
assignment_id: '27',
course_id: '3',
help_url: '',
@@ -1182,6 +1234,7 @@ QUnit.module('SpeedGrader - clicking save rubric button for an anonymous assignm
sinon.stub(window.rubricAssessment, 'assessmentData').returns({ 'rubric_assessment[user_id]': 'abcde' });
fixtures.innerHTML = `
+
@@ -1264,14 +1317,23 @@ QUnit.module('SpeedGrader - clicking save rubric button for an anonymous assignm
QUnit.module('SpeedGrader - no gateway timeout', {
setup () {
- fakeENV.setup();
+ fakeENV.setup({
+ assignment_id: '17',
+ course_id: '29',
+ grading_role: 'moderator',
+ help_url: 'example.com/support',
+ show_help_menu_item: false
+ })
this.server = sinon.fakeServer.create({ respondImmediately: true });
this.server.respondWith(
'GET',
`${window.location.pathname}.json${window.location.search}`,
[200, { 'Content-Type': 'application/json' }, '{ hello: "world"}']
);
- fixtures.innerHTML = ''
+ fixtures.innerHTML = `
+
+
+ `
},
teardown () {
fixtures.innerHTML = ''
@@ -1287,7 +1349,26 @@ test('does not show an error when the gateway times out', function () {
strictEqual($('#speed_grader_timeout_alert').text(), '');
});
-QUnit.module('SpeedGrader', function() {
+QUnit.module('SpeedGrader', function(suiteHooks) {
+ suiteHooks.beforeEach(() => {
+ fakeENV.setup({
+ assignment_id: '2',
+ course_id: '7',
+ help_url: 'example.com/foo',
+ show_help_menu_item: false
+ })
+ sinon.stub($, 'getJSON')
+ sinon.stub($, 'ajaxJSON')
+ fixtures.innerHTML = ''
+ })
+
+ suiteHooks.afterEach(() => {
+ $.getJSON.restore()
+ $.ajaxJSON.restore()
+ fixtures.innerHTML = ''
+ fakeENV.teardown()
+ })
+
QUnit.module('#refreshFullRubric', function(hooks) {
let speedGraderCurrentStudent;
let jsonData;
@@ -1300,7 +1381,7 @@ QUnit.module('SpeedGrader', function() {
hooks.beforeEach(function () {
fixtures.innerHTML = rubricHTML
- fakeENV.setup({ RUBRIC_ASSESSMENT: { assessment_type: 'peer_review' }});
+ fakeENV.setup({ ...window.ENV, RUBRIC_ASSESSMENT: { assessment_type: 'peer_review' }});
({jsonData} = window);
speedGraderCurrentStudent = SpeedGrader.EG.currentStudent;
window.jsonData = { rubric_association: {} };
@@ -1318,14 +1399,13 @@ QUnit.module('SpeedGrader', function() {
JQuerySelectorCache.prototype.get.restore();
SpeedGrader.EG.currentStudent = speedGraderCurrentStudent;
window.jsonData = jsonData;
- fakeENV.teardown();
fixtures.innerHTML = ''
});
QUnit.module('when the assessment is a grading assessment and the user is a grader', function(contextHooks) {
contextHooks.beforeEach(function() {
SpeedGrader.EG.currentStudent.rubric_assessments[0].assessment_type = 'grading'
- fakeENV.setup({ current_user_id: '7', RUBRIC_ASSESSMENT: { assessment_type: 'grading' }})
+ fakeENV.setup({ ...window.ENV, current_user_id: '7', RUBRIC_ASSESSMENT: { assessment_type: 'grading' }})
})
contextHooks.afterEach(function() {
@@ -1363,18 +1443,14 @@ QUnit.module('SpeedGrader', function() {
QUnit.module('#renderCommentTextArea', function(hooks) {
hooks.beforeEach(function() {
- fakeENV.setup()
- fixtures.innerHTML = ''
-
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
+ fixtures.innerHTML = `
+
+
+ `
})
hooks.afterEach(function() {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('mounts the comment text area when there is an element to mount it in', function() {
@@ -1395,6 +1471,7 @@ QUnit.module('SpeedGrader', function() {
QUnit.module('#setup', function(hooks) {
hooks.beforeEach(function() {
fakeENV.setup({
+ ...window.ENV,
assignment_id: '17',
course_id: '29',
grading_role: 'moderator',
@@ -1403,30 +1480,17 @@ QUnit.module('SpeedGrader', function() {
})
fixtures.innerHTML = ''
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
})
hooks.afterEach(function() {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
})
- test('populates the settings mount point if anonymous_moderated_marking_enabled is true', () => {
- fakeENV.setup({...window.ENV, anonymous_moderated_marking_enabled: true})
+ test('populates the settings mount point', () => {
SpeedGrader.setup()
const mountPoint = document.getElementById('speedgrader-settings')
strictEqual(mountPoint.textContent, 'SpeedGrader Settings')
})
-
- test('does not populate the settings mount point if anonymous_moderated_marking_enabled is false', () => {
- fakeENV.setup({...window.ENV, anonymous_moderated_marking_enabled: false})
- SpeedGrader.setup()
- const mountPoint = document.getElementById('speedgrader-settings')
- strictEqual(mountPoint.textContent, '')
- })
})
QUnit.module('#renderSubmissionPreview', hooks => {
@@ -1476,8 +1540,6 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
@@ -1485,10 +1547,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
delete SpeedGrader.EG.currentStudent
window.jsonData = jsonData
teardownHandleFragmentChanged()
@@ -1561,14 +1620,13 @@ QUnit.module('SpeedGrader', function() {
}
anonymousHooks.beforeEach(() => {
- fakeENV.setup({anonymous_moderated_marking_enabled: true, force_anonymous_grading: true})
+ fakeENV.setup({...window.ENV, force_anonymous_grading: true})
window.jsonData = windowJsonData
})
anonymousHooks.afterEach(() => {
window.location.hash = ''
window.jsonData = originalJsonData
- fakeENV.teardown()
})
QUnit.module('#jsonReady', contextHooks => {
@@ -1687,8 +1745,6 @@ QUnit.module('SpeedGrader', function() {
show_help_menu_item: false
})
fixtures.innerHTML = ''
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
sinon.stub(SpeedGrader.EG, 'handleFragmentChanged');
sinon.stub(SpeedGrader.EG, 'goToStudent')
SpeedGrader.setup()
@@ -1697,10 +1753,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(function() {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
SpeedGrader.EG.goToStudent.restore()
SpeedGrader.EG.handleFragmentChanged.restore()
window.jsonData = originalJsonData
@@ -1733,8 +1786,6 @@ QUnit.module('SpeedGrader', function() {
show_help_menu_item: false
})
fixtures.innerHTML = ''
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
sinon.stub(SpeedGrader.EG, 'goToStudent')
sinon.stub(SpeedGrader.EG, 'handleFragmentChanged');
SpeedGrader.setup()
@@ -1746,11 +1797,8 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(function() {
fixtures.innerHTML = ''
- fakeENV.teardown()
SpeedGrader.EG.goToStudent.restore()
window.jsonData = originalJsonData
- $.getJSON.restore()
- $.ajaxJSON.restore()
})
test('goToStudent is called with student anonymous_id', () => {
@@ -1786,15 +1834,10 @@ QUnit.module('SpeedGrader', function() {
not empty
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
@@ -2459,10 +2439,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2504,8 +2481,6 @@ QUnit.module('SpeedGrader', function() {
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
SpeedGrader.setup()
window.jsonData = windowJsonData
SpeedGrader.EG.jsonReady()
@@ -2513,10 +2488,7 @@ QUnit.module('SpeedGrader', function() {
})
hooks.afterEach(() => {
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
window.jsonData = originalJsonData
delete SpeedGrader.EG.currentStudent
teardownHandleFragmentChanged()
@@ -2537,84 +2509,14 @@ QUnit.module('SpeedGrader', function() {
})
})
- QUnit.module('#handleModerationTabs', (suiteHooks) => {
- let originalCurrentStudent
-
- suiteHooks.beforeEach(() => {
- fixtures.innerHTML = `
-
- `
- originalCurrentStudent = SpeedGrader.EG.currentStudent
- SpeedGrader.EG.currentStudent = {
- id: 4,
- name: 'Guy B. Studying',
- submission: {
- provisional_grades: [
- {score: 3, grade: '3', provisional_grade_id: '22', scorer_id: '93'},
- {score: 4, grade: '4', provisional_grade_id: '91', scorer_id: '77'}
- ]
- }
- }
- fakeENV.setup()
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON')
- sinon.stub(SpeedGrader.EG, 'domReady')
- sinon.stub(SpeedGrader.EG, 'showSubmission')
- SpeedGrader.setup()
- })
-
- suiteHooks.afterEach(() => {
- SpeedGrader.EG.showSubmission.restore()
- SpeedGrader.EG.domReady.restore()
- $.ajaxJSON.restore()
- $.getJSON.restore()
- fakeENV.teardown()
- SpeedGrader.EG.currentStudent = originalCurrentStudent
- fixtures.innerHTML = ''
- })
-
- test('shows the moderation bar if there are provisional grades', () => {
- SpeedGrader.EG.handleModerationTabs()
- const moderationBar = document.getElementById('moderation_bar')
- strictEqual(moderationBar.style.display, '')
- })
-
- test('hides the moderation bar if there are not any provisional grades', () => {
- SpeedGrader.EG.currentStudent.submission.provisional_grades = []
- SpeedGrader.EG.handleModerationTabs()
- const moderationBar = document.getElementById('moderation_bar')
- strictEqual(moderationBar.style.display, 'none')
- })
-
- QUnit.module('when Anonymous Moderated Marking is enabled', (hooks) => {
- hooks.beforeEach(() => {
- ENV.anonymous_moderated_marking_enabled = true
- })
-
- test('hides the moderation bar if there are provisional grades', () => {
- SpeedGrader.EG.handleModerationTabs()
- const moderationBar = document.getElementById('moderation_bar')
- strictEqual(moderationBar.style.display, 'none')
- })
-
- test('hides the moderation bar if there are not any provisional grades', () => {
- SpeedGrader.EG.currentStudent.submission.provisional_grades = []
- SpeedGrader.EG.handleModerationTabs()
- const moderationBar = document.getElementById('moderation_bar')
- strictEqual(moderationBar.style.display, 'none')
- })
- })
- })
-
QUnit.module('#removeModerationBarAndShowSubmission', function(hooks) {
hooks.beforeEach(() => {
fixtures.innerHTML = `
+
`
- sinon.stub($, 'getJSON')
- sinon.stub($, 'ajaxJSON');
sinon.stub(SpeedGrader.EG, 'domReady')
sinon.stub(SpeedGrader.EG, 'showSubmission')
SpeedGrader.setup()
@@ -2623,8 +2525,6 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(() => {
SpeedGrader.EG.showSubmission.restore()
SpeedGrader.EG.domReady.restore()
- $.ajaxJSON.restore()
- $.getJSON.restore()
fixtures.innerHTML = ''
})
@@ -2687,10 +2587,9 @@ QUnit.module('SpeedGrader', function() {
let submission
hooks.beforeEach(() => {
- fakeENV.setup()
ENV.grading_type = 'gpa_scale'
-
fixtures.innerHTML = `
+
@@ -2720,7 +2619,6 @@ QUnit.module('SpeedGrader', function() {
EG.setupProvisionalGraderDisplayNames.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('displays the component if at least one provisional grade is present', () => {
@@ -2785,8 +2683,9 @@ QUnit.module('SpeedGrader', function() {
let submission
hooks.beforeEach(() => {
- fakeENV.setup()
+
fixtures.innerHTML = `
+
@@ -2815,7 +2714,6 @@ QUnit.module('SpeedGrader', function() {
EG.submitSelectedProvisionalGrade.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('calls submitSelectedProvisionalGrade with the grade ID when selectedGrade is passed', () => {
@@ -2861,8 +2759,8 @@ QUnit.module('SpeedGrader', function() {
const EG = SpeedGrader.EG
hooks.beforeEach(() => {
- fakeENV.setup()
fixtures.innerHTML = `
+
@@ -2885,7 +2783,6 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(() => {
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('sets the selected grader text to the passed-in label', () => {
@@ -2925,10 +2822,10 @@ QUnit.module('SpeedGrader', function() {
const EG = SpeedGrader.EG
hooks.beforeEach(() => {
- fakeENV.setup()
ENV.grading_role = 'moderator'
fixtures.innerHTML = `
+
@@ -2948,21 +2845,17 @@ QUnit.module('SpeedGrader', function() {
}
}
EG.setupProvisionalGraderDisplayNames()
- ENV.anonymous_moderated_marking_enabled = true
ENV.provisional_status_url = 'some_url_or_other'
sinon.stub(EG, 'onProvisionalGradesFetched')
- sinon.stub($, 'getJSON').callsFake((url, params, success) => {
+ $.getJSON.callsFake((url, params, success) => {
success({needs_provisional_grade: true})
})
})
hooks.afterEach(() => {
EG.onProvisionalGradesFetched.restore()
- $.getJSON.restore()
-
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('calls onProvisionalGradesFetched upon fetching data', () => {
@@ -3002,9 +2895,9 @@ QUnit.module('SpeedGrader', function() {
let submission
hooks.beforeEach(() => {
- fakeENV.setup()
fixtures.innerHTML = `
+
@@ -3024,7 +2917,6 @@ QUnit.module('SpeedGrader', function() {
}
}
EG.setupProvisionalGraderDisplayNames()
- ENV.anonymous_moderated_marking_enabled = true
submission = EG.currentStudent.submission
@@ -3037,7 +2929,6 @@ QUnit.module('SpeedGrader', function() {
EG.showStudent.restore()
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('sets needs_provisional_grade to the supplied value', () => {
@@ -3086,10 +2977,10 @@ QUnit.module('SpeedGrader', function() {
const EG = SpeedGrader.EG
hooks.beforeEach(() => {
- fakeENV.setup()
ENV.provisional_select_url = "provisional_select_url?{{provisional_grade_id}}"
fixtures.innerHTML = `
+
@@ -3109,9 +3000,8 @@ QUnit.module('SpeedGrader', function() {
}
}
EG.setupProvisionalGraderDisplayNames()
- ENV.anonymous_moderated_marking_enabled = true
- sinon.stub($, 'ajaxJSON').callsFake((url, method, params, success) => {
+ $.ajaxJSON.callsFake((url, method, params, success) => {
success(params)
})
sinon.stub(EG, 'fetchProvisionalGrades')
@@ -3121,15 +3011,15 @@ QUnit.module('SpeedGrader', function() {
hooks.afterEach(() => {
EG.renderProvisionalGradeSelector.restore()
EG.fetchProvisionalGrades.restore()
- $.ajaxJSON.restore()
teardownHandleFragmentChanged()
window.location.hash = ''
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('includes the value of ENV.provisional_select_url and provisionalGradeId in the URL', () => {
+ $.ajaxJSON.restore()
+ sinon.stub($, 'ajaxJSON')
EG.submitSelectedProvisionalGrade(123)
const [url] = $.ajaxJSON.firstCall.args
strictEqual(url, 'provisional_select_url?123')
@@ -3152,18 +3042,15 @@ QUnit.module('SpeedGrader', function() {
const EG = SpeedGrader.EG
hooks.beforeEach(() => {
- fakeENV.setup()
-
fixtures.innerHTML = `
+
`
-
SpeedGrader.setup()
- ENV.anonymous_moderated_marking_enabled = true
sinon.stub(EG, 'submitSelectedProvisionalGrade')
sinon.spy(EG, 'setActiveProvisionalGradeFields')
@@ -3176,7 +3063,6 @@ QUnit.module('SpeedGrader', function() {
window.location.hash = ''
fixtures.innerHTML = ''
- fakeENV.teardown()
})
test('assigns anonymous grader names based on sorted anonymous grader ID', () => {
diff --git a/spec/lib/api/v1/submission_spec.rb b/spec/lib/api/v1/submission_spec.rb
index 7285162e376..cb19e09b350 100644
--- a/spec/lib/api/v1/submission_spec.rb
+++ b/spec/lib/api/v1/submission_spec.rb
@@ -35,11 +35,16 @@ describe Api::V1::Submission do
let(:user) { User.create! }
let(:course) { Course.create! }
let(:assignment) { course.assignments.create! }
+ let(:teacher) {
+ teacher = User.create!
+ course.enroll_teacher(teacher)
+ teacher
+ }
let(:session) { {} }
let(:context) { nil }
let(:params) { { includes: [field]} }
let(:submission) { assignment.submissions.create!(user: user) }
- let(:provisional_grade) { submission.provisional_grades.create!(scorer: User.create!) }
+ let(:provisional_grade) { submission.provisional_grades.create!(scorer: teacher) }
describe 'speedgrader_url' do
it "links to the speed grader for a student's submission" do
diff --git a/spec/lib/data_fixup/backfill_anonymous_grading_data_spec.rb b/spec/lib/data_fixup/backfill_anonymous_grading_data_spec.rb
index e1bcda04907..45a62e79b03 100644
--- a/spec/lib/data_fixup/backfill_anonymous_grading_data_spec.rb
+++ b/spec/lib/data_fixup/backfill_anonymous_grading_data_spec.rb
@@ -52,41 +52,14 @@ describe DataFixup::BackfillAnonymousGradingData do
@course.enable_feature!(:anonymous_grading)
end
- context "when the base Anonymous Moderated Marking flag is off" do
- before(:once) do
- @root_account.disable_feature!(:anonymous_moderated_marking)
- end
-
- it "does not cause Anonymous Marking for the course to register as enabled" do
- # Note that technically this *does* flip on the Anonymous Marking
- # feature flag for the course, but because it depends on the base
- # AMM flag, any check for whether it's enabled while that flag is
- # off will return false. This is confusing but is the "correct"
- # behavior for these purposes.
- do_backfill
- expect(@course).not_to be_feature_enabled(:anonymous_marking)
- end
-
- it "sets assignments to be anonymously graded" do
- do_backfill
- expect(assignment_anonymously_graded).to be true
- end
+ it "enables Anonymous Marking for the course" do
+ do_backfill
+ expect(@course).to be_feature_enabled(:anonymous_marking)
end
- context "when the base Anonymous Moderated Marking flag is on" do
- before(:once) do
- @root_account.enable_feature!(:anonymous_moderated_marking)
- end
-
- it "enables Anonymous Marking for the course" do
- do_backfill
- expect(@course).to be_feature_enabled(:anonymous_marking)
- end
-
- it "sets assignments to be anonymously graded" do
- do_backfill
- expect(assignment_anonymously_graded).to be true
- end
+ it "sets assignments to be anonymously graded" do
+ do_backfill
+ expect(assignment_anonymously_graded).to be true
end
end
end
diff --git a/spec/lib/features/anonymous_moderated_marking_spec.rb b/spec/lib/features/anonymous_moderated_marking_spec.rb
deleted file mode 100644
index 7ad7dac1446..00000000000
--- a/spec/lib/features/anonymous_moderated_marking_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2018 - present Instructure, Inc.
-#
-# This file is part of Canvas.
-#
-# Canvas is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see