From 5ad46e233ac8b0f3bb587a7e315d686f45c67e70 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Fri, 30 Dec 2011 18:55:21 -0200 Subject: [PATCH] Integration of AI1413 with AI2111 --- app/models/product.rb | 5 ----- app/views/catalog/index.rhtml | 2 +- features/browse_catalogs.feature | 81 ++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index 546dd9b..f54cdce 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -145,11 +145,6 @@ class Product < ActiveRecord::Base false end - # FIXME this will check the validity of price composition with inputs and other costs - def is_open_price? - false - end - def has_basic_info? %w[unit price discount].each do |field| return true if !self.send(field).blank? diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml index 702655c..55109cc 100644 --- a/app/views/catalog/index.rhtml +++ b/app/views/catalog/index.rhtml @@ -50,7 +50,7 @@ <% end %> - <% if product.is_open_price? %> + <% if product.price_described? %>
  • <%= _('price composition') %>
    diff --git a/features/browse_catalogs.feature b/features/browse_catalogs.feature index 125b50b..d5cbb31 100644 --- a/features/browse_catalogs.feature +++ b/features/browse_catalogs.feature @@ -159,7 +159,7 @@ Feature: browse catalogs When I click "product-description-button" Then I should see "A small description" within "#product-description" And the "product-description" should be visible - When I click "product-description-button" + When I click "product-list" Then the "product-description" should not be visible Scenario: display unavailable product @@ -190,40 +190,51 @@ Feature: browse catalogs And I should see "Organic" within "span.search-product-qualifier" And I should not see "price composition" -#FIXME: this will only be available after AI1413 -# @selenium -# Scenario: display price composition button (but not inputs) -# Given the following product -# | owner | category | name | price | -# | artebonito | food | Bananada | 10.00 | -# And the following input -# | product | category | price_per_unit | amount_used | -# | Bananada | food | 0.99 | 5 | -# And I am on /catalog/artebonito -# And I reload and wait for the page -# Then I should see "Bananada" within "li.product-link" -# And I should see "10.00" within "span.product-price" -# And I should see "price composition" within "#product-price-composition-button" -# And the "#product-price-composition-button" should be visible -# And I should see "food" within "#product-price-composition" -# And I should see "4.95" within "#product-price-composition" -# And the "#product-price-composition" should not be visible + @selenium + Scenario: not display price composition button if price is not described + Given the following product + | owner | category | name | price | + | artebonito | food | Bananada | 10.00 | + And the following input + | product | category | price_per_unit | amount_used | + | Bananada | food | 0.99 | 5 | + And I am on /catalog/artebonito + And I reload and wait for the page + Then I should see "Bananada" within "li.product-link" + And I should see "10.00" within "span.product-price" + And the "#product-price-composition-button" should not be visible -#FIXME: this will only be available after AI1413 -# @selenium -# Scenario: display price composition when button is clicked -# Given the following product -# | owner | category | name | price | -# | artebonito | food | Bananada | 10.00 | -# And the following input -# | product | category | price_per_unit | amount_used | -# | Bananada | food | 0.99 | 5 | -# And I am on /catalog/artebonito -# And I reload and wait for the page -# When I click "#product-price-composition-button" -# Then the "#product-price-composition" should be visible -# And I should see "food" within "#product-price-composition" -# And I should see "4.95" within "#product-price-composition" + @selenium + Scenario: display price composition button (but not inputs) + Given the following product + | owner | category | name | price | + | artebonito | food | Bananada | 10.00 | + And the following input + | product | category | price_per_unit | amount_used | + | Bananada | food | 2.00 | 5 | + And I am on /catalog/artebonito + And I reload and wait for the page + Then I should see "Bananada" within "li.product-link" + And I should see "10.00" within "span.product-price" + And I should see "price composition" within "#product-price-composition-button" + And the "#product-price-composition-button" should be visible + And I should see "food" within "#product-price-composition" + And I should see "10.00" within "#product-price-composition" + + @selenium + Scenario: display price composition when button is clicked + Given the following product + | owner | category | name | price | + | artebonito | food | Bananada | 10.88 | + And the following input + | product | category | price_per_unit | amount_used | + | Bananada | food | 2.72 | 4 | + And I am on /catalog/artebonito + And I reload and wait for the page + When I click "#product-price-composition-button" + Then the "#product-price-composition" should be visible + And I should see "food" within "#product-price-composition" + And I should see "10.88" within "#product-price-composition" @selenium Scenario: display inputs and raw materials button when not completely filled @@ -294,5 +305,5 @@ Feature: browse catalogs When I click "#inputs-button" Then the "#inputs-description" should be visible And I should see "7.0 Liter of food" within "#inputs-description" - When I click "#inputs-button" + When I click "#product-list" Then the "#inputs-description" should not be visible -- libgit2 0.21.2