From d6f65544f8db7a1669d1c3fea906bb40fbe60372 Mon Sep 17 00:00:00 2001 From: Cristina Date: Fri, 5 Feb 2021 15:24:06 +0000 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20the=2010kft=20support=20?= =?UTF-8?q?project=20as=20=E2=80=9Caffected=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the 10kft ID for the support project was moved from being a constant to being an env var, we kept comparing it to other project IDs without type conversion. However, env vars are strings, and project IDs are integers. Convert to string before comparing. --- .env.test | 2 +- app/controllers/support_rotations_controller.rb | 2 +- .../users_can_see_the_table_of_support_rotations_spec.rb | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env.test b/.env.test index 793f9ed..c7b3a1f 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ TENK_USER_ID=user@example.com TENK_PASSWORD=really-strong-password -TENK_ID_FOR_SUPPORT= +TENK_ID_FOR_SUPPORT=101 HTTP_BASIC_PASSWORD=really-strong-password-2 HTTP_BASIC_USER=user@example.com diff --git a/app/controllers/support_rotations_controller.rb b/app/controllers/support_rotations_controller.rb index 985f442..e1b4309 100644 --- a/app/controllers/support_rotations_controller.rb +++ b/app/controllers/support_rotations_controller.rb @@ -60,7 +60,7 @@ def ops_eng_name def affected_projects in_hours_projects = (first_line_dev.projects + first_line_ops.projects).uniq - client_projects = in_hours_projects.select { |p| p.tenk_id != Project::TENK_ID_FOR_SUPPORT } + client_projects = in_hours_projects.select { |p| p.tenk_id.to_s != Project::TENK_ID_FOR_SUPPORT } client_projects.select do |project| start_date <= Date.parse(project.ends_at) && end_date >= Date.parse(project.starts_at) diff --git a/spec/features/users_can_see_the_table_of_support_rotations_spec.rb b/spec/features/users_can_see_the_table_of_support_rotations_spec.rb index 28f7b71..db98cd1 100644 --- a/spec/features/users_can_see_the_table_of_support_rotations_spec.rb +++ b/spec/features/users_can_see_the_table_of_support_rotations_spec.rb @@ -6,8 +6,9 @@ end it "will show the people assigned to support rotations and the affected client projects" do + support_project = Project.create(name: "1st line support", tenk_id: ENV.fetch("TENK_ID_FOR_SUPPORT", nil)) client1 = Project.create(name: "Client One", tenk_id: 123, starts_at: 1.month.ago, ends_at: Date.today.to_s) - team_member = TeamMember.create(first_name: "Jay", projects: [client1], tenk_id: 1234) + team_member = TeamMember.create(first_name: "Jay", projects: [client1, support_project], tenk_id: 1234) past_day = team_member.support_days.create(date: 1.month.ago, support_type: "dev") current_day = team_member.support_days.create(date: Date.today, support_type: "dev") @@ -22,5 +23,6 @@ expect(page).to have_content("Support rotations") expect(page).to have_content("Client One") + expect(page).not_to have_content("1st line support") end end