Added 2 hour start date overlap for calendar events

Added new NSL logo
Change default gather passwords
Explicitly add sprockets to the Gemfile
This commit is contained in:
Luke Barratt 2014-04-04 23:56:22 +01:00
parent 2906590b58
commit 6269d4a69b
8 changed files with 50 additions and 14 deletions

View file

@ -14,7 +14,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, :phantomjs_logger => File.open('/dev/null'))
end
Capybara.javascript_driver = :poltergeist
Capybara.javascript_driver = :selenium
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
@ -30,7 +30,7 @@ RSpec.configure do |config|
config.before(:each) do
if example.metadata[:type] == :feature
Capybara.current_driver = :poltergeist
Capybara.current_driver = :selenium
else
Capybara.use_default_driver
end