Download as
Browse Code »

Commit 76e5dbdd5ce7e769e59e5c9f8b182dd53122d423

Authored by Leandro Santos
1 parent 29151d66
Exists in staging and in 1 other branch production

fix email template merge conflit

Showing 2 changed files with 4 additions and 5 deletions   Show diff stats
app/controllers/my_profile/email_templates_controller.rb
  Diff comments   View file @76e5dbd
@@ -15,7 +15,6 @@ class EmailTemplatesController < ApplicationController @@ -15,7 +15,6 @@ class EmailTemplatesController < ApplicationController
15 15
16 def show_parsed 16 def show_parsed
17 @email_template = owner.email_templates.find(params[:id]) 17 @email_template = owner.email_templates.find(params[:id])
18 - template_params = {:profile => owner, :environment => environment}  
19 render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)} 18 render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
20 end 19 end
21 20
test/functional/profile_email_templates_controller_test.rb
  Diff comments   View file @76e5dbd
@@ -55,14 +55,14 @@ class ProfileEmailTemplatesControllerTest < ActionController::TestCase @@ -55,14 +55,14 @@ class ProfileEmailTemplatesControllerTest < ActionController::TestCase
55 55
56 test "should get parsed template" do 56 test "should get parsed template" do
57 environment = Environment.default 57 environment = Environment.default
58 - @email_template.subject = '{{profile.name}} - {{profile.identifier}}'  
59 - @email_template.body = '{{profile.name}} - {{profile.identifier}} - {{environment.name}}' 58 + @email_template.subject = '{{profile_name}} - {{environment_name}}'
  59 + @email_template.body = '{{profile_name}} - {{environment_name}}'
60 @email_template.save! 60 @email_template.save!
61 get :show_parsed, id: @email_template, :profile => profile.identifier 61 get :show_parsed, id: @email_template, :profile => profile.identifier
62 assert_response :success 62 assert_response :success
63 json_response = ActiveSupport::JSON.decode(@response.body) 63 json_response = ActiveSupport::JSON.decode(@response.body)
64 - assert_equal "#{profile.name} - #{profile.identifier}", json_response['parsed_subject']  
65 - assert_equal "#{profile.name} - #{profile.identifier} - #{environment.name}", json_response['parsed_body'] 64 + assert_equal "#{@person.name} - #{environment.name}", json_response['parsed_subject']
  65 + assert_equal "#{@person.name} - #{environment.name}", json_response['parsed_body']
66 end 66 end
67 67
68 end 68 end