slightly less failing test suite but removing the annoying 404 failures

This commit is contained in:
2016-07-04 08:41:38 +02:00
parent 780332f6de
commit 1d52e78c65
4 changed files with 10 additions and 10 deletions
+7 -7
View File
@@ -229,7 +229,7 @@ GEM
faye-websocket (0.10.4) faye-websocket (0.10.4)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
font-awesome-rails (4.6.3.0) font-awesome-rails (4.6.3.1)
railties (>= 3.2, < 5.1) railties (>= 3.2, < 5.1)
foreman (0.82.0) foreman (0.82.0)
thor (~> 0.19.1) thor (~> 0.19.1)
@@ -275,7 +275,7 @@ GEM
mime-types (>= 1.16, < 4) mime-types (>= 1.16, < 4)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.2) mime-types (2.99.2)
mimemagic (0.3.0) mimemagic (0.3.1)
mini_magick (4.5.1) mini_magick (4.5.1)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.0)
@@ -308,12 +308,12 @@ GEM
oauth2 (~> 1.0) oauth2 (~> 1.0)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (4.3.6) paperclip (5.0.0)
activemodel (>= 3.2.0) activemodel (>= 4.2.0)
activesupport (>= 3.2.0) activesupport (>= 4.2.0)
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (= 0.3.0) mimemagic (~> 0.3.0)
pickadate-rails (3.5.6.0) pickadate-rails (3.5.6.0)
railties (>= 3.1.0) railties (>= 3.1.0)
pkg-config (1.1.7) pkg-config (1.1.7)
@@ -445,7 +445,7 @@ GEM
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.5) tilt (2.0.5)
timecop (0.8.1) timecop (0.8.1)
tinymce-rails (4.3.13) tinymce-rails (4.4.0)
railties (>= 3.1.1) railties (>= 3.1.1)
turnip (2.1.1) turnip (2.1.1)
gherkin (~> 2.5) gherkin (~> 2.5)
+1 -1
View File
@@ -106,7 +106,7 @@ namespace :deploy do
#end #end
#end #end
rsync_host = host rsync_host = host
run_locally { execute "rsync -av --delete --ignore-times ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } run_locally { execute "rsync -azv --delete --ignore-times ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" }
#run_locally { execute "rsync -av ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } #run_locally { execute "rsync -av ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" }
execute :chown, "-R www-data:www-data", shared_path.join('public/assets/') execute :chown, "-R www-data:www-data", shared_path.join('public/assets/')
+1 -1
View File
@@ -109,7 +109,7 @@ module SpecEmberHelpers
ember_ready = page.evaluate_script('window.ember_ready') ember_ready = page.evaluate_script('window.ember_ready')
times += 1 times += 1
end end
raise "Ember is not loaded and should be" unless ember_ready raise "Ember is not loaded and should be. Current path is: #{page.current_path}" unless ember_ready
blk.call blk.call
end end
end end
+1 -1
View File
@@ -58,7 +58,7 @@ module Features
end end
super(*args) super(*args)
if Capybara.current_driver == Capybara.javascript_driver if Capybara.current_driver == Capybara.javascript_driver
if page.current_path != "/admin/employees/test_login" if %w[/user /supplier].any? { |path_prefix| page.current_path.starts_with? path_prefix }
when_ember_is_ready { } when_ember_is_ready { }
end end
end end