prestashop-automation 0.5 → 0.6

data/lib/actions/carriers.rb

@@ -89,6 +89,8 @@ module PrestaShopAutomation
 			sleep 4 #this wait seems necessary, strange
 			click 'a.buttonFinish'
 			standard_success_check
+
+			return options[:name]
 		end
 	end
 end

data/lib/actions/installer.rb

@@ -66,10 +66,14 @@ module PrestaShopAutomation
 			client.query("DROP DATABASE IF EXISTS #{safe_database_name}")
 		end
 
+		def database_exists
+			count = client.query("SHOW DATABASES LIKE '#{client.escape @database_name}'").count
+			expect(count).to be <= 1
+			count == 1
+		end
+
 		def prepare_database
-			results = client.query("SHOW DATABASES LIKE '#{client.escape @database_name}'")
-			expect(results.count).to be <= 1
-			if results.count == 0
+			if !database_exists
 				client.query "CREATE DATABASE #{safe_database_name}"
 			else
 				tables = client.query("SHOW TABLES IN #{safe_database_name} LIKE '#{client.escape @database_prefix}%'")

data/lib/actions/orders.rb

@@ -60,7 +60,7 @@ module PrestaShopAutomation
 
 			if options[:get_invoice_json]
 				visit pdf_url+'&debug=1'
-				return JSON.parse(page.find('body').text)
+				return JSON.parse(find('body').text)
 			end
 		end
 	end

data/lib/actions/settings.rb

@@ -12,7 +12,7 @@ module PrestaShopAutomation
 			standard_success_check
 		end
 
-		def set_gift_wrapping_option on, options
+		def set_gift_wrapping_option on, options={}
 			goto_admin_tab 'AdminOrderPreferences'
 			if on
 				click_label_for 'PS_GIFT_WRAPPING_on'

data/lib/actions/taxes.rb

@@ -33,7 +33,7 @@ module PrestaShopAutomation
 		end
 
 		def create_tax_group_from_rate rate
-			if /^(?:\d+(?:.\d+)?)$/ =~ rate
+			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}]
 			elsif /(?:\d+(?:.\d+)?)(?:\s*(?:\+|\*)\s*(?:\d+(?:.\d+)?))+/ =~ rate

data/lib/helpers/general.rb

@@ -53,11 +53,13 @@ module PrestaShopAutomation
 		end
 
 		def visit base, rest=nil
-			if rest == nil
-				super base
+			url = if rest == nil
+				base
 			else
-				super base.sub(/\/\s*/, '') + rest.sub(/^\s*\//, '')
+				base.sub(/\/\s*/, '') + rest.sub(/^\s*\//, '')
 			end
+
+			super url
 		end
 
 		def wait_until options = {}, &block

data/lib/prestashop-automation.rb

@@ -1,5 +1,6 @@
 require 'rspec-expectations'
 require 'capybara'
+require 'shellwords'
 
 require_relative 'actions/general.rb'
 require_relative 'actions/settings.rb'
@@ -13,6 +14,7 @@ require_relative 'actions/installer.rb'
 require_relative 'helpers/general.rb'
 
 module PrestaShopAutomation
+
 	class PrestaShop < Capybara::Session
 
         include RSpec::Expectations
@@ -48,6 +50,8 @@ module PrestaShopAutomation
             @filesystem_path = options[:filesystem_path]
 			@version = options[:version]
 
+			@dumps = []
+
 			super :selenium
 		end
 
@@ -55,5 +59,69 @@ module PrestaShopAutomation
             driver.browser.quit
         end
 
+		def dump_database target
+			if database_exists
+				cmd = "mysqldump -uroot "
+				if @database_password.to_s.strip != ''
+					cmd += "-p#{Shellwords.shellescape @database_password} "
+				end
+				cmd += "-h#{Shellwords.shellescape @database_host} "
+				cmd += "-P#{@database_port} "
+				cmd += "#{Shellwords.shellescape @database_name} "
+				cmd += "> #{Shellwords.shellescape target}"
+				`#{cmd}`
+				if !$?.success?
+					throw "Could not dump database!"
+				end
+				return true
+			else
+				return false
+			end
+		end
+
+		def load_database src
+			prepare_database
+			cmd = "mysql -uroot "
+			if @database_password.to_s.strip != ''
+				cmd += "-p#{Shellwords.shellescape @database_password} "
+			end
+			cmd += "-h#{Shellwords.shellescape @database_host} "
+			cmd += "-P#{@database_port} "
+			cmd += "#{Shellwords.shellescape @database_name} "
+			cmd += "< #{Shellwords.shellescape src}"
+			`#{cmd}`
+			return $?.success?
+		end
+
+		def clear_cookies
+			reset!
+		end
+
+		def save
+			out = {
+				:database => nil,
+				:files => nil
+			}
+
+			if database_exists
+				out[:database] = Tempfile.new 'prestashop-db'
+				dump_database out[:database].path
+			end
+
+			@dumps << out
+
+			return out
+		end
+
+		def restore dump=nil
+			unless dump
+				dump = @dumps.pop
+			end
+
+			if dump[:database]
+				load_database dump[:database].path
+			end
+		end
+
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prestashop-automation
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors: