prestashop-automation 0.6 → 0.6.1

data/lib/actions/installer.rb

@@ -15,7 +15,9 @@ module PrestaShopAutomation
 			click '#btNext'
 
 			fill_in 'infosShop', :with => options[:shop_name] || @database_name
-			find("input[name='db_mode'][value='#{options[:no_demo_products] ? 'lite' : 'full'}']").click
+			if has_selector? "input[name='db_mode']"
+				find("input[name='db_mode'][value='#{options[:no_demo_products] ? 'lite' : 'full'}']").click
+			end
 			select_by_value_jqChosen '#infosCountry', options[:country] || 'us'
 
 			if options[:timezone]

data/lib/actions/orders.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module PrestaShopAutomation
 	module OrdersActions
 
@@ -52,7 +54,7 @@ module PrestaShopAutomation
 			pdf_url = find('a[href*="generateInvoicePDF"]')['href']
 
 			if options[:dump_pdf_to]
-				all_cookies = page.driver.browser.manage.all_cookies
+				all_cookies = driver.browser.manage.all_cookies
 				cookies = all_cookies.map do |c| "#{c[:name]}=#{c[:value]}" end.join ";"
 					cmd = "curl --url #{Shellwords.shellescape pdf_url} -b \"#{cookies}\" -o #{Shellwords.shellescape options[:dump_pdf_to]} 2>/dev/null"
 					`#{cmd}` #download the PDF

data/lib/actions/settings.rb

@@ -1,6 +1,20 @@
 module PrestaShopAutomation
 	module SettingsActions
 
+		def set_rounding_rule option
+			goto_admin_tab 'AdminTaxes'
+
+			value = {:item => 1, :line => 2, :total => 3}[option.to_sym]
+
+			if value
+				select_by_value '#PS_TAX_ROUND_TYPE', value
+				click_button_named 'submitOptionstax', :first => true
+				standard_success_check
+			else
+				throw "Unsupported option: #{option}"
+			end
+		end
+
 		def set_friendly_urls on
 			goto_admin_tab 'AdminMeta'
 			if on

data/lib/actions/taxes.rb

@@ -32,10 +32,10 @@ module PrestaShopAutomation
 			return current_url[/\bid_tax_rules_group=(\d+)/, 1].to_i
 		end
 
-		def create_tax_group_from_rate rate
+		def create_tax_group_from_rate rate, taxes_pool={}
 			if /^(?:\d+(?:.\d+)?)$/ =~ rate.to_s
 				tax_id = create_tax :name => "#{rate}% Tax (Rate)", :rate => rate
-				create_tax_group :name => "#{rate}% Tax (Group)", :taxes => [{:tax_id => tax_id}]
+				taxes_pool[rate] ||= create_tax_group :name => "#{rate}% Tax (Group)", :taxes => [{:tax_id => tax_id}]
 			elsif /(?:\d+(?:.\d+)?)(?:\s*(?:\+|\*)\s*(?:\d+(?:.\d+)?))+/ =~ rate
 				taxes = []
 				combine = {'+' => :sum, '*' => :multiply}[rate[/(\+|\*)/, 1]] || :no
@@ -45,7 +45,7 @@ module PrestaShopAutomation
 					elsif token == '*'
 						combine = :multiply
 					else
-						tax_id = create_tax :name => "#{token}% Tax (Rate)", :rate => token
+						tax_id = taxes_pool[rate] ||= (create_tax :name => "#{token}% Tax (Rate)", :rate => token)
 						taxes << {
 							:tax_id => tax_id,
 							:combine => combine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prestashop-automation
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -20,17 +20,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/prestashop-automation.rb
-- lib/helpers/general.rb
-- lib/actions/products.rb
-- lib/actions/installer.rb
-- lib/actions/cart_rules.rb
 - lib/actions/carriers.rb
+- lib/actions/cart_rules.rb
+- lib/actions/general.rb
+- lib/actions/installer.rb
 - lib/actions/orders.rb
+- lib/actions/products.rb
 - lib/actions/settings.rb
-- lib/actions/general.rb
 - lib/actions/taxes.rb
-- test/all.rb
+- lib/helpers/general.rb
+- lib/prestashop-automation.rb
 homepage: https://github.com/djfm/prestashop-automation
 licenses:
 - OSL

data/test/all.rb

@@ -1,130 +0,0 @@
-require_relative '../lib/prestashop-automation.rb'
-
-ps = PrestaShopAutomation::PrestaShop.new({
-	:back_office_url => 'http://localhost/1.6/admin-dev/',
-	:front_office_url => 'http://localhost/1.6/',
-	:installer_url => 'http://localhost/1.6/install-dev',
-	:admin_email => 'pub@prestashop.com',
-	:admin_password => '123456789',
-	:database_name => '1.6'
-})
-
-describe 'Installing' do
-	it 'should use the UI to prepare the database' do
-		ps.drop_database
-		ps.install
-		ps.reset!
-	end
-
-	it 'should prepare the database externally' do
-		ps.drop_database
-		ps.install :prepare_database => true
-		ps.reset!
-	end
-end
-
-describe 'Front Office Primitives' do
-
-	before :all do
-		ps.login_to_front_office
-		ps.login_to_back_office
-		ps.set_friendly_urls false
-	end
-
-	after :all do
-		ps.logout_of_front_office
-		ps.logout_of_back_office
-	end
-
-	it 'should add product 1 to cart and make an order in OPC' do
-		ps.goto_back_office
-		ps.set_order_process_type :opc
-		ps.goto_front_office
-		ps.add_product_to_cart 1
-		order_id = ps.order_current_cart_opc :carrier => 'My carrier'
-		ps.goto_back_office
-		ps.validate_order id: order_id
-	end
-
-	it 'should add product 1 to cart and make an order in 5 steps checkout' do
-		ps.goto_back_office
-		ps.set_order_process_type :five_steps
-		ps.goto_front_office
-		ps.add_product_to_cart 1
-		order_id = ps.order_current_cart_5_steps :carrier => 'My carrier'
-		ps.goto_back_office
-		ps.validate_order id: order_id
-	end
-end
-
-describe 'Back Office Primitives' do
-
-	before :all do
-		ps.login_to_back_office
-	end
-
-	after :all do
-		ps.logout_of_back_office
-	end
-
-	describe 'Creating And Deleting a Cart Rule' do
-		it 'should work with one product' do
-			id = ps.create_cart_rule :name => 'YiiHaaa', :product_id => 1, :amount => '10%'
-			ps.delete_cart_rule id
-		end
-	end
-
-	describe 'Creating carriers' do
-		it 'should work in the simplest case' do
-			ps.create_carrier :name => 'Turtle Bob'
-		end
-	end
-
-	describe 'Creating taxes' do
-
-		it 'should create a complicated tax group' do
-			ps.create_tax_group_from_rate '10 + 9.6'
-		end
-
-		it 'should create a tax and a tax group' do
-			tax_id = ps.create_tax :name => 'Some Tax', :rate => '20'
-			ps.create_tax_group :name => 'Test Tax Group', :taxes => [{:tax_id => tax_id}]
-		end
-	end
-
-	describe 'Creating products' do
-
-		it 'should work with a specific price' do
-			ps.create_product :name => 'Petit Sachet de Vis Cruciformes Pas Cher', :price => '1.92', :specific_price => 'minus 1 tax included'
-		end
-
-		it 'should work with just a price and a name' do
-			ps.create_product :name => 'Petit Sachet de Vis Cruciformes', :price => '1.85'
-		end
-	end
-
-	describe 'Changing a few settings' do
-		it 'should enable OPC' do
-			ps.set_order_process_type :opc
-		end
-
-		it 'should disable OPC' do
-			ps.set_order_process_type :five_steps
-		end
-
-		it 'shoud enable Gift Wrapping' do
-			ps.set_gift_wrapping_option true, :price => 2
-		end
-
-		it 'shoud enable Friendly URLs' do
-			ps.set_friendly_urls true
-		end
-	end
-
-	describe 'Navigating the back office' do
-		it 'should go to AdminOrders' do
-			ps.goto_admin_tab 'AdminOrders'
-		end
-	end
-
-end