Download as
Browse Code »

Commit 0c9588c08c0277c941654479400b7a89ce0e941f

Authored by Rodrigo Souto
1 parent 3d63f6b0
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: fix manager_products_helper tests

Showing 1 changed file with 9 additions and 9 deletions   Show diff stats
test/unit/manage_products_helper_test.rb
  Diff comments   View file @0c9588c
1 # encoding: UTF-8 1 # encoding: UTF-8
2 require File.dirname(__FILE__) + '/../test_helper' 2 require File.dirname(__FILE__) + '/../test_helper'
3 3
4 -class ManageProductsHelperTest < ActiveSupport::TestCase 4 +class ManageProductsHelperTest < ActionView::TestCase
5 5
6 include ManageProductsHelper 6 include ManageProductsHelper
7 include ContentViewerHelper 7 include ContentViewerHelper
@@ -139,13 +139,13 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase @@ -139,13 +139,13 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
139 end 139 end
140 140
141 should 'show unit on label of amount selection' do 141 should 'show unit on label of amount selection' do
142 - input = Input.new()  
143 - input.expects(:product).returns(Product.new(:unit => Unit.new(:singular => 'Meter'))) 142 + input = build(Input)
  143 + input.expects(:product).returns(build(Product, :unit => Unit.new(:singular => 'Meter')))
144 assert_equal 'Amount used by meter of this product or service', label_amount_used(input) 144 assert_equal 'Amount used by meter of this product or service', label_amount_used(input)
145 end 145 end
146 146
147 should 'not show unit on label of amount selection if product has no unit selected' do 147 should 'not show unit on label of amount selection if product has no unit selected' do
148 - input = Input.new() 148 + input = build(Input)
149 input.expects(:product).returns(Product.new) 149 input.expects(:product).returns(Product.new)
150 assert_equal 'Amount used in this product or service', label_amount_used(input) 150 assert_equal 'Amount used in this product or service', label_amount_used(input)
151 end 151 end
@@ -161,8 +161,8 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase @@ -161,8 +161,8 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
161 qualifier = fast_create(Qualifier, :name => 'Organic') 161 qualifier = fast_create(Qualifier, :name => 'Organic')
162 fbes = fast_create(Certifier, :name => 'FBES') 162 fbes = fast_create(Certifier, :name => 'FBES')
163 colivre = fast_create(Certifier, :name => 'Colivre') 163 colivre = fast_create(Certifier, :name => 'Colivre')
164 - QualifierCertifier.create!(:qualifier => qualifier, :certifier => colivre)  
165 - QualifierCertifier.create!(:qualifier => qualifier, :certifier => fbes) 164 + create(QualifierCertifier, :qualifier => qualifier, :certifier => colivre)
  165 + create(QualifierCertifier, :qualifier => qualifier, :certifier => fbes)
166 166
167 result = certifiers_for_select(qualifier) 167 result = certifiers_for_select(qualifier)
168 assert_equal ["Self declared", "Colivre", "FBES"], result.map{|i| i[0]} 168 assert_equal ["Self declared", "Colivre", "FBES"], result.map{|i| i[0]}
@@ -172,7 +172,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase @@ -172,7 +172,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
172 product = fast_create(Product) 172 product = fast_create(Product)
173 qualifier = fast_create(Qualifier) 173 qualifier = fast_create(Qualifier)
174 certifier = fast_create(Certifier) 174 certifier = fast_create(Certifier)
175 - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) 175 + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier)
176 assert_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product) 176 assert_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product)
177 end 177 end
178 178
@@ -180,7 +180,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase @@ -180,7 +180,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
180 product = fast_create(Product) 180 product = fast_create(Product)
181 qualifier = fast_create(Qualifier) 181 qualifier = fast_create(Qualifier)
182 certifier = fast_create(Certifier) 182 certifier = fast_create(Certifier)
183 - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) 183 + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier)
184 qualifier.destroy 184 qualifier.destroy
185 assert_nothing_raised do 185 assert_nothing_raised do
186 assert_no_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product) 186 assert_no_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product)
@@ -191,7 +191,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase @@ -191,7 +191,7 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
191 product = fast_create(Product) 191 product = fast_create(Product)
192 qualifier = fast_create(Qualifier) 192 qualifier = fast_create(Qualifier)
193 certifier = fast_create(Certifier) 193 certifier = fast_create(Certifier)
194 - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) 194 + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier)
195 certifier.destroy 195 certifier.destroy
196 assert_nothing_raised do 196 assert_nothing_raised do
197 result = display_qualifiers(product) 197 result = display_qualifiers(product)