screenshot.rb in aipim-rails-0.0.41

- old
+ new
@@ -1,14 +1,26 @@
 require 'selenium-webdriver'
 
-%x[rm aipim/screenshots/*]
+%x[rm -r aipim/screenshots/*]
 
-Before('@javascript') do |scenario|
+Before do |scenario|
+	@ScenarioTitle = scenario.title
+	@ScenarioDescription = scenario.description
+	@FeatureFile = scenario.file.to_s.split('/')
+	@FeatureFile.delete_at(0)
+	@FeatureFile = @FeatureFile.join('/')
+	@FeatureName = scenario.feature.title
+	@ScenarioTags = scenario.source_tag_names
+
 	page.driver.browser.manage.window.maximize
+	page.driver.browser.manage.window.resize_to(1024, 768)
 end
 
-After('@screenshot') do
-	return unless page.driver.browser
-	sleep(1.0)
-	page.driver.save_screenshot("aipim/screenshots/#{Time.now.to_i}.png")
-end
+After do
+	if (@ScenarioTags.include?('@screenshot') && @ScenarioTags.include?('@javascript')) && !page.driver.browser.nil?
+		path = "aipim/screenshots/#{@FeatureFile}"
+		system("mkdir -p #{path}")
 
+		sleep(1.0)
+		page.driver.save_screenshot("#{path}/#{Time.now.to_i}.png")
+	end
+end
\ No newline at end of file