From bd795be80ed7b4d77a3c08eddbd4fd05d2bb5875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 21 Sep 2019 23:53:42 +0200 Subject: [PATCH] Check for attribute values in current budget tests Assigning a variable to each budget we declare results in useless assignments. We could just delete the three useless assignments and leave the fourth one, but I find the code easier to read if we use the name of the budgets to differenciate between them. This way we also keep the code vertically aligned. --- spec/controllers/application_controller_spec.rb | 10 +++++----- spec/models/budget_spec.rb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 9d45652f0..d68787f35 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -5,13 +5,13 @@ describe ApplicationController do describe "#current_budget" do it "returns the last budget that is not in draft phase" do - old_budget = create(:budget, :finished, created_at: 2.years.ago) - previous_budget = create(:budget, :accepting, created_at: 1.year.ago) - current_budget = create(:budget, :accepting, created_at: 1.month.ago) - next_budget = create(:budget, :drafting, created_at: 1.week.ago) + create(:budget, :finished, created_at: 2.years.ago, name: "Old") + create(:budget, :accepting, created_at: 1.year.ago, name: "Previous") + create(:budget, :accepting, created_at: 1.month.ago, name: "Current") + create(:budget, :drafting, created_at: 1.week.ago, name: "Next") budget = subject.instance_eval { current_budget } - expect(budget).to eq(current_budget) + expect(budget.name).to eq("Current") end end diff --git a/spec/models/budget_spec.rb b/spec/models/budget_spec.rb index 027212db0..55cf323a3 100644 --- a/spec/models/budget_spec.rb +++ b/spec/models/budget_spec.rb @@ -166,12 +166,12 @@ describe Budget do end it "returns the last budget created that is not in drafting phase" do - old_budget = create(:budget, :finished, created_at: 2.years.ago) - previous_budget = create(:budget, :accepting, created_at: 1.year.ago) - current_budget = create(:budget, :accepting, created_at: 1.month.ago) - next_budget = create(:budget, :drafting, created_at: 1.week.ago) + create(:budget, :finished, created_at: 2.years.ago, name: "Old") + create(:budget, :accepting, created_at: 1.year.ago, name: "Previous") + create(:budget, :accepting, created_at: 1.month.ago, name: "Current") + create(:budget, :drafting, created_at: 1.week.ago, name: "Next") - expect(Budget.current).to eq(current_budget) + expect(Budget.current.name).to eq "Current" end end