diff --git a/CHANGELOG.md b/CHANGELOG.md index fd37c3d0..025d2696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### New Features - Cucumber rake tasks minor updates ### Bug-fixes +- [#252](https://github.com/strongqa/howitzer/issues/252) Wrong location of log files fixed - [#248](https://github.com/strongqa/howitzer/issues/248) FactoryGirl renamed to FactoryBot in cucumber transformation. - [#246](https://github.com/strongqa/howitzer/issues/246) Options fixed for rspec rake tasks ## [v2.1.0](https://github.com/strongqa/howitzer/compare/v2.0.3...v2.1.0) diff --git a/generators/config/templates/capybara.rb b/generators/config/templates/capybara.rb index fe853aeb..02c47722 100644 --- a/generators/config/templates/capybara.rb +++ b/generators/config/templates/capybara.rb @@ -39,6 +39,8 @@ module CapybaraHelpers require_relative "drivers/#{Howitzer.driver}" +Capybara.save_path = Howitzer.log_dir + Capybara::Screenshot.append_timestamp = false Capybara::Screenshot.register_filename_prefix_formatter(:default) do "capybara-screenshot-#{Gen.serial}" diff --git a/generators/config/templates/drivers/headless_chrome.rb b/generators/config/templates/drivers/headless_chrome.rb index e3054bfe..025d74dd 100644 --- a/generators/config/templates/drivers/headless_chrome.rb +++ b/generators/config/templates/drivers/headless_chrome.rb @@ -10,7 +10,6 @@ Capybara::Selenium::Driver.new app, params end -Capybara.save_path = Howitzer.log_dir Capybara::Screenshot.register_driver(:headless_chrome) do |driver, path| driver.browser.save_screenshot path end diff --git a/generators/config/templates/drivers/phantomjs.rb b/generators/config/templates/drivers/phantomjs.rb index 8223b5d1..3e18c612 100644 --- a/generators/config/templates/drivers/phantomjs.rb +++ b/generators/config/templates/drivers/phantomjs.rb @@ -14,7 +14,6 @@ ) end -Capybara.save_path = Howitzer.log_dir Capybara::Screenshot.register_driver(:phantomjs) do |driver, path| driver.browser.save_screenshot path end diff --git a/spec/unit/generators/config_generator_spec.rb b/spec/unit/generators/config_generator_spec.rb index be50b730..3e544d73 100644 --- a/spec/unit/generators/config_generator_spec.rb +++ b/spec/unit/generators/config_generator_spec.rb @@ -22,8 +22,8 @@ { name: '/config/drivers', is_directory: true }, { name: '/config/drivers/browserstack.rb', is_directory: false, size: 914 }, { name: '/config/drivers/crossbrowsertesting.rb', is_directory: false, size: 1126 }, - { name: '/config/drivers/headless_chrome.rb', is_directory: false, size: 696 }, - { name: '/config/drivers/phantomjs.rb', is_directory: false, size: 636 }, + { name: '/config/drivers/headless_chrome.rb', is_directory: false, size: 658 }, + { name: '/config/drivers/phantomjs.rb', is_directory: false, size: 598 }, { name: '/config/drivers/poltergeist.rb', is_directory: false, size: 362 }, { name: '/config/drivers/sauce.rb', is_directory: false, size: 871 }, { name: '/config/drivers/selenium.rb', is_directory: false, size: 1097 },