prestashop-automation-tool 0.4 → 0.4.1

data/bin/pat

@@ -38,8 +38,11 @@ elsif ARGV[0] == 'init'
 	unless File.exists? 'tests-available'
 		`git clone #{conf.config[:tests_repository]} tests-available`
 	end
+	unless File.exists? 'tests-output'
+		Dir.mkdir 'tests-output'
+	end
 elsif ARGV[0] == 'purge'
-	`rm -Rf pat.conf.json tests-enabled tests-available`
+	`rm -Rf pat.conf.json tests-enabled tests-available tests-output`
 elsif ARGV[0] == 'install'
 	withConfig do |conf|
 		ps = PrestaShopAutomation::PrestaShop.new(conf[:shop])
@@ -74,14 +77,29 @@ elsif ARGV[0] == 'test'
 	list.sort!
 
 	list.each do |file|
+
+		env = {
+			'PAT_NO_RESTORE' => (options[:no_restore] ? '1' : '0'),
+			'PAT_OUTPUT_PREFIX' => 'tests-output/' + File.basename(file, File.extname(file))
+		}
+
 		ok = if file =~ /\.rb$/
 			puts "Running #{file}..."
-			system({'NO_RESTORE' => options[:no_restore]}, 'rspec', file)
+			system(env, 'rspec', file)
 		elsif file =~ /\.json$/
 			puts "Running #{file}..."
 			data = JSON.parse File.read(file)
+
+			tempfile = nil
+			if base = data['spec']['extend']
+				baseData = JSON.parse File.read(File.join File.dirname(file), "#{base}.json")
+				data = PrestaShopAutomationTool.merge baseData, data
+				file = env['PAT_OUTPUT_PREFIX'] + '.json'
+				File.write file, JSON.pretty_generate(data)
+			end
+
 			runner = "pat-runner-#{data['spec']['runner']}.rb"
-			system({'PAT_SOURCE' => file, 'NO_RESTORE' => (options[:no_restore] ? '1' : '0')}, runner)
+			system(env.merge({'PAT_SOURCE' => file}), runner)
 		else
 			:not_runnable
 		end

data/bin/pat-runner-invoice.rb

@@ -105,6 +105,6 @@ scenario = JSON.parse File.read(ENV['PAT_SOURCE'])
 
 describe 'Invoice test' do
 	it 'should work' do
-		test_invoice @shop, scenario, :dump_pdf_to => ENV['PAT_SOURCE'].sub(/\.json$/, '.pdf')
+		test_invoice @shop, scenario, :dump_pdf_to => (ENV['PAT_OUTPUT_PREFIX'] + '.pdf')
 	end
 end

data/lib/prestashop-automation-tool/helper.rb

@@ -7,13 +7,13 @@ RSpec.configure do |config|
 	config.before :all do
 		conf = JSON.parse(File.read('pat.conf.json'), :symbolize_names => true)
 		@shop = PrestaShopAutomation::PrestaShop.new conf[:shop]
-		unless ENV['NO_RESTORE'] == '1'
+		unless ENV['PAT_NO_RESTORE'] == '1'
 			dump = @shop.save
 		end
 	end
 
 	config.after :all do
-		unless ENV['NO_RESTORE'] == '1'
+		unless ENV['PAT_NO_RESTORE'] == '1'
 			@shop.restore dump
 		end
 	end

data/lib/prestashop-automation-tool.rb

@@ -8,6 +8,30 @@ module PrestaShopAutomationTool
 		File.expand_path '../..', __FILE__
 	end
 
+	def self.merge a, b
+		if a.is_a? Hash and b.is_a? Hash
+			merged = {}
+
+			a.each_pair do |ka, va|
+				if b.has_key? ka
+					merged[ka] = merge va, b[ka]
+				else
+					merged[ka] = va
+				end
+			end
+
+			b.each_pair do |kb, vb|
+				unless a.has_key? kb
+					merged[kb] = vb
+				end
+			end
+
+			return merged
+		else
+			return b
+		end
+	end
+
 	class ConfigurationParser
 
 		attr_reader :config

metadata

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