Merge pull request #574 from ivanka12/auctions_full

update auction_full

@@ -321,6 +321,9 @@ Library         Selenium2Library
 Поставити максимально можливу ставку
   Wait Until Page Contains Element    id=max_bid_amount_price
   ${last_amount}=     Get Text        id=max_bid_amount_price
+  ${last_amount}=  convert_amount_string_to_float  ${last_amount}
+  ${value}=  Convert To Number  0.01
+  ${last_amount}=  subtraction  ${last_amount}  ${value}
   Поставити ставку   ${last_amount}   Заявку прийнято
 
 
@@ -373,4 +376,5 @@ Library         Selenium2Library
 
 
 Перевірити чи ставка була прийнята
-  Page Should Contain  ${USERS['${CURRENT_USER}']['last_amount']}
+  ${last_amount}=  convert_amount  ${USERS['${CURRENT_USER}']['last_amount']}
+  Page Should Contain  ${last_amount}

@@ -39,8 +39,13 @@ def create_fake_title():
 def create_fake_date():
     return get_now().isoformat()
 
+
 def subtraction(value1, value2):
-    return (int(value1) - int(value2))
+    if "." in str (value1) or "." in str (value2):
+        return (float (value1) - float (value2))
+    else:
+        return (int (value1) - int (value2))
+
 
 def create_fake_value_amount():
     return fake.random_int(min=1)
@@ -57,6 +62,10 @@ def translate_country_en(country):
         raise Exception(u"Cannot translate country to english: {}".format(country))
 
 
+def convert_amount(amount):
+    return  (("{:,}".format(float (amount))).replace(',',' ').replace('.',','))
+
+
 def translate_country_ru(country):
     if country == u"Україна":
         return u"Украина"

@@ -50,6 +50,7 @@ from .initial_data import (
     create_fake_title,
     create_fake_value_amount,
     test_change_document_data,
+    convert_amount,
 )
 from barbecue import chef
 from restkit import request