Download as
Browse Code »

Commit 2314438925af827b694fbaaf59c31c49dd2c0c31

Authored by Jeroen van Baarsen
1 parent d54d3324
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Fix for failing specs

Showing 5 changed files with 30 additions and 34 deletions   Show diff stats
@@ -15,9 +15,6 @@ env: @@ -15,9 +15,6 @@ env:
15 - TASK=jasmine:ci DB=postgresql 15 - TASK=jasmine:ci DB=postgresql
16 before_install: 16 before_install:
17 - sudo apt-get install libicu-dev -y 17 - sudo apt-get install libicu-dev -y
18 -branches:  
19 - only:  
20 - - 'master'  
21 rvm: 18 rvm:
22 - 2.0.0 19 - 2.0.0
23 services: 20 services:
@@ -199,7 +199,7 @@ group :development, :test do @@ -199,7 +199,7 @@ group :development, :test do
199 # gem 'rails-dev-tweaks' 199 # gem 'rails-dev-tweaks'
200 gem 'spinach-rails' 200 gem 'spinach-rails'
201 gem "rspec-rails" 201 gem "rspec-rails"
202 - gem "capybara" 202 + gem "capybara", '~> 2.2.1'
203 gem "pry" 203 gem "pry"
204 gem "awesome_print" 204 gem "awesome_print"
205 gem "database_cleaner" 205 gem "database_cleaner"
@@ -222,7 +222,7 @@ group :development, :test do @@ -222,7 +222,7 @@ group :development, :test do
222 gem 'rb-inotify', require: linux_only('rb-inotify') 222 gem 'rb-inotify', require: linux_only('rb-inotify')
223 223
224 # PhantomJS driver for Capybara 224 # PhantomJS driver for Capybara
225 - gem 'poltergeist', '~> 1.4.1' 225 + gem 'poltergeist', '~> 1.5.1'
226 226
227 gem 'jasmine', '2.0.0.rc5' 227 gem 'jasmine', '2.0.0.rc5'
228 228
@@ -47,7 +47,7 @@ GEM @@ -47,7 +47,7 @@ GEM
47 bootstrap-sass (3.0.3.0) 47 bootstrap-sass (3.0.3.0)
48 sass (~> 3.2) 48 sass (~> 3.2)
49 builder (3.1.4) 49 builder (3.1.4)
50 - capybara (2.1.0) 50 + capybara (2.2.1)
51 mime-types (>= 1.16) 51 mime-types (>= 1.16)
52 nokogiri (>= 1.3.3) 52 nokogiri (>= 1.3.3)
53 rack (>= 1.0.0) 53 rack (>= 1.0.0)
@@ -60,7 +60,7 @@ GEM @@ -60,7 +60,7 @@ GEM
60 celluloid (0.15.2) 60 celluloid (0.15.2)
61 timers (~> 1.1.0) 61 timers (~> 1.1.0)
62 charlock_holmes (0.6.9.4) 62 charlock_holmes (0.6.9.4)
63 - cliver (0.2.2) 63 + cliver (0.3.2)
64 code_analyzer (0.4.3) 64 code_analyzer (0.4.3)
65 sexp_processor 65 sexp_processor
66 coderay (1.1.0) 66 coderay (1.1.0)
@@ -281,9 +281,9 @@ GEM @@ -281,9 +281,9 @@ GEM
281 treetop (~> 1.4.8) 281 treetop (~> 1.4.8)
282 method_source (0.8.2) 282 method_source (0.8.2)
283 mime-types (1.25.1) 283 mime-types (1.25.1)
284 - mini_portile (0.5.3) 284 + mini_portile (0.6.0)
285 minitest (4.7.5) 285 minitest (4.7.5)
286 - multi_json (1.10.0) 286 + multi_json (1.10.1)
287 multi_xml (0.5.5) 287 multi_xml (0.5.5)
288 multipart-post (1.2.0) 288 multipart-post (1.2.0)
289 mysql2 (0.3.11) 289 mysql2 (0.3.11)
@@ -291,8 +291,8 @@ GEM @@ -291,8 +291,8 @@ GEM
291 net-scp (1.1.2) 291 net-scp (1.1.2)
292 net-ssh (>= 2.6.5) 292 net-ssh (>= 2.6.5)
293 net-ssh (2.8.0) 293 net-ssh (2.8.0)
294 - nokogiri (1.6.1)  
295 - mini_portile (~> 0.5.0) 294 + nokogiri (1.6.2.1)
  295 + mini_portile (= 0.6.0)
296 nprogress-rails (0.1.2.3) 296 nprogress-rails (0.1.2.3)
297 oauth (0.4.7) 297 oauth (0.4.7)
298 oauth2 (0.8.1) 298 oauth2 (0.8.1)
@@ -324,9 +324,9 @@ GEM @@ -324,9 +324,9 @@ GEM
324 orm_adapter (0.5.0) 324 orm_adapter (0.5.0)
325 pg (0.15.1) 325 pg (0.15.1)
326 phantomjs (1.9.2.0) 326 phantomjs (1.9.2.0)
327 - poltergeist (1.4.1)  
328 - capybara (~> 2.1.0)  
329 - cliver (~> 0.2.1) 327 + poltergeist (1.5.1)
  328 + capybara (~> 2.1)
  329 + cliver (~> 0.3.1)
330 multi_json (~> 1.0) 330 multi_json (~> 1.0)
331 websocket-driver (>= 0.2.0) 331 websocket-driver (>= 0.2.0)
332 polyglot (0.3.4) 332 polyglot (0.3.4)
@@ -557,7 +557,7 @@ GEM @@ -557,7 +557,7 @@ GEM
557 webmock (1.16.0) 557 webmock (1.16.0)
558 addressable (>= 2.2.7) 558 addressable (>= 2.2.7)
559 crack (>= 0.3.2) 559 crack (>= 0.3.2)
560 - websocket-driver (0.3.1) 560 + websocket-driver (0.3.3)
561 xpath (2.0.0) 561 xpath (2.0.0)
562 nokogiri (~> 1.3) 562 nokogiri (~> 1.3)
563 563
@@ -573,7 +573,7 @@ DEPENDENCIES @@ -573,7 +573,7 @@ DEPENDENCIES
573 better_errors 573 better_errors
574 binding_of_caller 574 binding_of_caller
575 bootstrap-sass (~> 3.0) 575 bootstrap-sass (~> 3.0)
576 - capybara 576 + capybara (~> 2.2.1)
577 carrierwave 577 carrierwave
578 coffee-rails 578 coffee-rails
579 colored 579 colored
@@ -630,7 +630,7 @@ DEPENDENCIES @@ -630,7 +630,7 @@ DEPENDENCIES
630 omniauth-twitter 630 omniauth-twitter
631 org-ruby 631 org-ruby
632 pg 632 pg
633 - poltergeist (~> 1.4.1) 633 + poltergeist (~> 1.5.1)
634 protected_attributes 634 protected_attributes
635 pry 635 pry
636 quiet_assets (~> 1.0.1) 636 quiet_assets (~> 1.0.1)
features/support/env.rb
  Diff comments   View file @2314438
@@ -28,7 +28,7 @@ WebMock.allow_net_connect! @@ -28,7 +28,7 @@ WebMock.allow_net_connect!
28 require 'capybara/poltergeist' 28 require 'capybara/poltergeist'
29 Capybara.javascript_driver = :poltergeist 29 Capybara.javascript_driver = :poltergeist
30 Capybara.register_driver :poltergeist do |app| 30 Capybara.register_driver :poltergeist do |app|
31 - Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60) 31 + Capybara::Poltergeist::Driver.new(app, js_errors: false, timeout: 90)
32 end 32 end
33 Spinach.hooks.on_tag("javascript") do 33 Spinach.hooks.on_tag("javascript") do
34 ::Capybara.current_driver = ::Capybara.javascript_driver 34 ::Capybara.current_driver = ::Capybara.javascript_driver
spec/support/db_cleaner.rb
  Diff comments   View file @2314438
1 -require 'database_cleaner'  
2 -  
3 RSpec.configure do |config| 1 RSpec.configure do |config|
4 - config.before do  
5 - if example.metadata[:js]  
6 - DatabaseCleaner.strategy = :truncation  
7 - Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true  
8 - else  
9 - DatabaseCleaner.strategy = :transaction  
10 - end 2 + config.around(:each) do
  3 + DatabaseCleaner.clean_with(:truncation)
  4 + end
  5 +
  6 + config.around(:each) do
  7 + DatabaseCleaner.strategy = :transaction
  8 + end
  9 +
  10 + config.around(:each, js: true) do
  11 + DatabaseCleaner.strategy = :truncation
  12 + end
11 13
12 - unless example.metadata[:no_db]  
13 - DatabaseCleaner.start  
14 - end 14 + config.before(:each) do
  15 + DatabaseCleaner.start
15 end 16 end
16 17
17 - config.after do  
18 - unless example.metadata[:no_db]  
19 - DatabaseCleaner.clean  
20 - end 18 + config.after(:each) do
  19 + DatabaseCleaner.clean
21 end 20 end
22 end 21 end