Commit 0c9588c08c0277c941654479400b7a89ce0e941f
1 parent
3d63f6b0
Exists in
master
and in
27 other branches
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
| 1 | 1 | # encoding: UTF-8 |
| 2 | 2 | require File.dirname(__FILE__) + '/../test_helper' |
| 3 | 3 | |
| 4 | -class ManageProductsHelperTest < ActiveSupport::TestCase | |
| 4 | +class ManageProductsHelperTest < ActionView::TestCase | |
| 5 | 5 | |
| 6 | 6 | include ManageProductsHelper |
| 7 | 7 | include ContentViewerHelper |
| ... | ... | @@ -139,13 +139,13 @@ class ManageProductsHelperTest < ActiveSupport::TestCase |
| 139 | 139 | end |
| 140 | 140 | |
| 141 | 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 | 144 | assert_equal 'Amount used by meter of this product or service', label_amount_used(input) |
| 145 | 145 | end |
| 146 | 146 | |
| 147 | 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 | 149 | input.expects(:product).returns(Product.new) |
| 150 | 150 | assert_equal 'Amount used in this product or service', label_amount_used(input) |
| 151 | 151 | end |
| ... | ... | @@ -161,8 +161,8 @@ class ManageProductsHelperTest < ActiveSupport::TestCase |
| 161 | 161 | qualifier = fast_create(Qualifier, :name => 'Organic') |
| 162 | 162 | fbes = fast_create(Certifier, :name => 'FBES') |
| 163 | 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 | 167 | result = certifiers_for_select(qualifier) |
| 168 | 168 | assert_equal ["Self declared", "Colivre", "FBES"], result.map{|i| i[0]} |
| ... | ... | @@ -172,7 +172,7 @@ class ManageProductsHelperTest < ActiveSupport::TestCase |
| 172 | 172 | product = fast_create(Product) |
| 173 | 173 | qualifier = fast_create(Qualifier) |
| 174 | 174 | certifier = fast_create(Certifier) |
| 175 | - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) | |
| 175 | + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier) | |
| 176 | 176 | assert_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product) |
| 177 | 177 | end |
| 178 | 178 | |
| ... | ... | @@ -180,7 +180,7 @@ class ManageProductsHelperTest < ActiveSupport::TestCase |
| 180 | 180 | product = fast_create(Product) |
| 181 | 181 | qualifier = fast_create(Qualifier) |
| 182 | 182 | certifier = fast_create(Certifier) |
| 183 | - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) | |
| 183 | + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier) | |
| 184 | 184 | qualifier.destroy |
| 185 | 185 | assert_nothing_raised do |
| 186 | 186 | assert_no_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product) |
| ... | ... | @@ -191,7 +191,7 @@ class ManageProductsHelperTest < ActiveSupport::TestCase |
| 191 | 191 | product = fast_create(Product) |
| 192 | 192 | qualifier = fast_create(Qualifier) |
| 193 | 193 | certifier = fast_create(Certifier) |
| 194 | - ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier) | |
| 194 | + create(ProductQualifier, :product => product, :qualifier => qualifier, :certifier => certifier) | |
| 195 | 195 | certifier.destroy |
| 196 | 196 | assert_nothing_raised do |
| 197 | 197 | result = display_qualifiers(product) | ... | ... |