From 3eca6b31bd5508a5fea258cfc88e63410d468b1c Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 4 Apr 2016 14:14:10 +0200 Subject: [PATCH 1/2] changes the format of the Spending proposal code --- app/models/spending_proposal.rb | 2 +- spec/models/spending_proposal_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 3e461518c..8532a7f8a 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -102,7 +102,7 @@ class SpendingProposal < ActiveRecord::Base end def code - "#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") + "#{Setting["proposal_code_prefix"]}-#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") end def send_unfeasible_email diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index ebe3573a4..df5b5bdd6 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -114,12 +114,12 @@ describe SpendingProposal do let(:spending_proposal) { create(:spending_proposal) } it "returns the proposal id" do - expect(spending_proposal.code).to eq("#{spending_proposal.id}") + expect(spending_proposal.code).to include("#{spending_proposal.id}") end it "returns the administrator id when assigned" do spending_proposal.administrator = create(:administrator) - expect(spending_proposal.code).to eq("#{spending_proposal.id}-A#{spending_proposal.administrator.id}") + expect(spending_proposal.code).to include("#{spending_proposal.id}-A#{spending_proposal.administrator.id}") end end end From dea67a36ca60b608ebec5b3a077b17c834a666e4 Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 4 Apr 2016 14:56:16 +0200 Subject: [PATCH 2/2] fixes failing email spec --- spec/features/emails_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 4d813493d..c6f0d3708 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -141,7 +141,7 @@ feature 'Emails' do spending_proposal.reload email = open_last_email - expect(email).to have_subject("Your investment project '#{spending_proposal.id}-A#{spending_proposal.administrator.id}' has been marked as unfeasible") + expect(email).to have_subject("Your investment project '#{spending_proposal.code}' has been marked as unfeasible") expect(email).to deliver_to(spending_proposal.author.email) expect(email).to have_body_text(spending_proposal.title) expect(email).to have_body_text(spending_proposal.code)