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
.travis.yml
  Diff comments   View file @2314438
... ... @@ -15,9 +15,6 @@ env:
15 15 - TASK=jasmine:ci DB=postgresql
16 16 before_install:
17 17 - sudo apt-get install libicu-dev -y
18   -branches:
19   - only:
20   - - 'master'
21 18 rvm:
22 19 - 2.0.0
23 20 services:
... ...
Gemfile
  Diff comments   View file @2314438
... ... @@ -199,7 +199,7 @@ group :development, :test do
199 199 # gem 'rails-dev-tweaks'
200 200 gem 'spinach-rails'
201 201 gem "rspec-rails"
202   - gem "capybara"
  202 + gem "capybara", '~> 2.2.1'
203 203 gem "pry"
204 204 gem "awesome_print"
205 205 gem "database_cleaner"
... ... @@ -222,7 +222,7 @@ group :development, :test do
222 222 gem 'rb-inotify', require: linux_only('rb-inotify')
223 223  
224 224 # PhantomJS driver for Capybara
225   - gem 'poltergeist', '~> 1.4.1'
  225 + gem 'poltergeist', '~> 1.5.1'
226 226  
227 227 gem 'jasmine', '2.0.0.rc5'
228 228  
... ...
Gemfile.lock
  Diff comments   View file @2314438
... ... @@ -47,7 +47,7 @@ GEM
47 47 bootstrap-sass (3.0.3.0)
48 48 sass (~> 3.2)
49 49 builder (3.1.4)
50   - capybara (2.1.0)
  50 + capybara (2.2.1)
51 51 mime-types (>= 1.16)
52 52 nokogiri (>= 1.3.3)
53 53 rack (>= 1.0.0)
... ... @@ -60,7 +60,7 @@ GEM
60 60 celluloid (0.15.2)
61 61 timers (~> 1.1.0)
62 62 charlock_holmes (0.6.9.4)
63   - cliver (0.2.2)
  63 + cliver (0.3.2)
64 64 code_analyzer (0.4.3)
65 65 sexp_processor
66 66 coderay (1.1.0)
... ... @@ -281,9 +281,9 @@ GEM
281 281 treetop (~> 1.4.8)
282 282 method_source (0.8.2)
283 283 mime-types (1.25.1)
284   - mini_portile (0.5.3)
  284 + mini_portile (0.6.0)
285 285 minitest (4.7.5)
286   - multi_json (1.10.0)
  286 + multi_json (1.10.1)
287 287 multi_xml (0.5.5)
288 288 multipart-post (1.2.0)
289 289 mysql2 (0.3.11)
... ... @@ -291,8 +291,8 @@ GEM
291 291 net-scp (1.1.2)
292 292 net-ssh (>= 2.6.5)
293 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 296 nprogress-rails (0.1.2.3)
297 297 oauth (0.4.7)
298 298 oauth2 (0.8.1)
... ... @@ -324,9 +324,9 @@ GEM
324 324 orm_adapter (0.5.0)
325 325 pg (0.15.1)
326 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 330 multi_json (~> 1.0)
331 331 websocket-driver (>= 0.2.0)
332 332 polyglot (0.3.4)
... ... @@ -557,7 +557,7 @@ GEM
557 557 webmock (1.16.0)
558 558 addressable (>= 2.2.7)
559 559 crack (>= 0.3.2)
560   - websocket-driver (0.3.1)
  560 + websocket-driver (0.3.3)
561 561 xpath (2.0.0)
562 562 nokogiri (~> 1.3)
563 563  
... ... @@ -573,7 +573,7 @@ DEPENDENCIES
573 573 better_errors
574 574 binding_of_caller
575 575 bootstrap-sass (~> 3.0)
576   - capybara
  576 + capybara (~> 2.2.1)
577 577 carrierwave
578 578 coffee-rails
579 579 colored
... ... @@ -630,7 +630,7 @@ DEPENDENCIES
630 630 omniauth-twitter
631 631 org-ruby
632 632 pg
633   - poltergeist (~> 1.4.1)
  633 + poltergeist (~> 1.5.1)
634 634 protected_attributes
635 635 pry
636 636 quiet_assets (~> 1.0.1)
... ...
features/support/env.rb
  Diff comments   View file @2314438
... ... @@ -28,7 +28,7 @@ WebMock.allow_net_connect!
28 28 require 'capybara/poltergeist'
29 29 Capybara.javascript_driver = :poltergeist
30 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 32 end
33 33 Spinach.hooks.on_tag("javascript") do
34 34 ::Capybara.current_driver = ::Capybara.javascript_driver
... ...
spec/support/db_cleaner.rb
  Diff comments   View file @2314438
1   -require 'database_cleaner'
2   -
3 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 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 20 end
22 21 end
... ...