Merge pull request #1031 from consul/spending_proposals_code

changes the format of the Spending proposal code

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

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)

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