Skip to content

Commit

Permalink
Merge branch 'master' into hschallhorn/14124-enable-bulk-assign-orgs
Browse files Browse the repository at this point in the history
  • Loading branch information
va-bot authored Jun 16, 2020
2 parents 415bd26 + 076e82a commit 939db3e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
4 changes: 4 additions & 0 deletions app/models/tasks/special_case_movement_task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ class SpecialCaseMovementTask < Task
:verify_appeal_distributable
after_create :close_and_create_judge_task

def self.label
COPY::CASE_MOVEMENT_TASK_LABEL
end

private

def close_and_create_judge_task
Expand Down
1 change: 1 addition & 0 deletions client/COPY.json
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@
"UNAUTHORIZED_PAGE_ACCESS_MESSAGE": "You aren't authorized to use this part of Caseflow yet.",
"CASE_DETAILS_LOADING_FAILURE_TITLE": "Unable to load this case",

"CASE_MOVEMENT_TASK_LABEL": "Case Movement",
"JUDGE_ASSIGN_TASK_LABEL": "Assign",
"JUDGE_DECISION_REVIEW_TASK_LABEL": "Review",
"JUDGE_QUALITY_REVIEW_TASK_LABEL": "Quality review",
Expand Down
2 changes: 1 addition & 1 deletion spec/feature/queue/special_case_movement_task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SpecialCaseMovementTeam.singleton.add_user(scm_user)
User.authenticate!(user: scm_user)
end
describe "Special Case Movement Team Member" do
describe "Case Movement Team Member" do
context "With the Appeal in the right state" do
it "successfully assigns the task to judge" do
visit("queue/appeals/#{appeal.external_id}")
Expand Down
2 changes: 1 addition & 1 deletion spec/models/tasks/distribution_task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
expect(distribution_task.available_actions(user).count).to eq(0)
end

it "with Special Case Movement Team user has the Special Case Movement action" do
it "with Case Movement Team user has the Case Movement action" do
expect(distribution_task.available_actions(scm_user).count).to eq(1)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/models/tasks/judge_task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
end
end

context "user is a Special Case Movement team member" do
context "user is a Case Movement team member" do
let(:user) do
create(:user).tap { |scm_user| SpecialCaseMovementTeam.singleton.add_user(scm_user) }
end
Expand Down
14 changes: 7 additions & 7 deletions spec/models/tasks/special_case_movement_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

describe SpecialCaseMovementTask, :postgres do
describe ".create" do
context "with Special Case Movement Team user" do
let(:scm_user) { create(:user) }
context "with Case Movement Team user" do
let(:cm_user) { create(:user) }

subject do
SpecialCaseMovementTask.create!(appeal: appeal,
assigned_to: scm_user,
assigned_by: scm_user,
assigned_to: cm_user,
assigned_by: cm_user,
parent: dist_task)
end

before do
SpecialCaseMovementTeam.singleton.add_user(scm_user)
SpecialCaseMovementTeam.singleton.add_user(cm_user)
end

context "appeal ready for distribution" do
Expand Down Expand Up @@ -81,8 +81,8 @@

subject do
SpecialCaseMovementTask.create!(appeal: appeal,
assigned_to: scm_user,
assigned_by: scm_user,
assigned_to: cm_user,
assigned_by: cm_user,
parent: evidence_window_task)
end

Expand Down

0 comments on commit 939db3e

Please sign in to comment.