Merge branch 'master' into plugin-move

This commit is contained in:
wvengen 2013-10-30 11:06:53 +01:00
commit ccbf3be4a6

View file

@ -29,6 +29,8 @@ RSpec.configure do |config|
config.before(:each) do config.before(:each) do
DatabaseCleaner.strategy = (example.metadata[:js] ? :truncation : :transaction) DatabaseCleaner.strategy = (example.metadata[:js] ? :truncation : :transaction)
DatabaseCleaner.start DatabaseCleaner.start
# maximise window so that buttons can be found on popups
example.metadata[:js] and page.driver.browser.manage.window.maximize
end end
config.after(:each) do config.after(:each) do
DatabaseCleaner.clean DatabaseCleaner.clean