diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 81293b386..8998fed6b 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -77,7 +77,7 @@ class SpendingProposal < ActiveRecord::Base end def code - "#{id}" + (administrator.present? ? "-#{administrator.id}" : "") + "#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") end end diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 3ca35a14c..378098367 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -122,7 +122,7 @@ feature 'Emails' do expect(email).to have_body_text(user_confirmation_path) end - scenario "Email on unfeasible spending proposal", :focus do + scenario "Email on unfeasible spending proposal" do spending_proposal = create(:spending_proposal) administrator = create(:administrator) valuator = create(:valuator) @@ -140,7 +140,7 @@ feature 'Emails' do spending_proposal.reload email = open_last_email - expect(email).to have_subject("Your investment project '#{spending_proposal.id}-#{spending_proposal.administrator.id}' has been marked as unfeasible") + expect(email).to have_subject("Your investment project '#{spending_proposal.id}-A#{spending_proposal.administrator.id}' 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.feasible_explanation) diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index 9ca2fae94..340515f84 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -104,7 +104,7 @@ describe SpendingProposal do it "returns the administrator id when assigned" do spending_proposal.administrator = create(:administrator) - expect(spending_proposal.code).to eq("#{spending_proposal.id}-#{spending_proposal.administrator.id}") + expect(spending_proposal.code).to eq("#{spending_proposal.id}-A#{spending_proposal.administrator.id}") end end end