Fix employee adding

2015-02-27 11:09:16 +01:00
parent 6e805fed3e
commit bfc0f336d1
13 changed files with 137 additions and 21 deletions
@@ -10,7 +10,7 @@ require 'turnip/capybara'
 require 'in_memory_q_counter'
 require 'capybara-screenshot/rspec'
 require 'webmock/rspec'
-#require 'capybara/poltergeist'
+require 'capybara/poltergeist'

 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -21,9 +21,9 @@ Dir.glob("spec/acceptance_steps/**/*steps.rb") { |f| load f, true }
 I18n.locale =I18n.default_locale
 Devise.stretches = 1
 #Capybara.javascript_driver = :webkit
-#Capybara.javascript_driver = :poltergeist
-Capybara.javascript_driver = :selenium
-Capybara.default_wait_time = 4 # ember needs more time than the default of 2
+Capybara.javascript_driver = :poltergeist
+#Capybara.javascript_driver = :selenium
+Capybara.default_wait_time = 3 # ember needs more time than the default of 2
 Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }
 WebMock.disable_net_connect!(allow_localhost: true)

@@ -169,12 +169,14 @@ RSpec.configure do |config|
   end

  config.after :suite do
+=begin
    rspec_outfile = Rails.root.join('coverage/rspec_results.html')
    result = File.read rspec_outfile
    replacement = %|<body><div><a href="index.html" style="padding:4px 8px;background-color:#393;color:white;font-weight:bold;border:2px #050 outset">Coverage</a></div>|
    result.gsub! /<body>/, replacement
    File.open(rspec_outfile, 'w'){|f| f.puts result}
    `open #{rspec_outfile}`
+=end
  end

  # If true, the base class of anonymous controllers will be inferred