Download as
Browse Code »

Commit 08c3c0659ca65d89c7998ce690b30a1d09b6df87

Authored by Dmitriy Zaporozhets
2 parents 77b6bd9b 2545b0f8
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge pull request #7086 from jvanbaarsen/revert-rspec-fix 

Revert "Fix for failing specs"
Showing 4 changed files with 31 additions and 30 deletions   Show diff stats
Gemfile
  Diff comments   View file @08c3c06
... ... @@ -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", '~> 2.2.1'
  202 + gem "capybara"
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.5.1'
  225 + gem 'poltergeist', '~> 1.4.1'
226 226  
227 227 gem 'jasmine', '2.0.2'
228 228  
... ...
Gemfile.lock
  Diff comments   View file @08c3c06
... ... @@ -62,7 +62,7 @@ GEM
62 62 celluloid (0.15.2)
63 63 timers (~> 1.1.0)
64 64 charlock_holmes (0.6.9.4)
65   - cliver (0.3.2)
  65 + cliver (0.2.2)
66 66 code_analyzer (0.4.3)
67 67 sexp_processor
68 68 coderay (1.1.0)
... ... @@ -283,9 +283,9 @@ GEM
283 283 treetop (~> 1.4.8)
284 284 method_source (0.8.2)
285 285 mime-types (1.25.1)
286   - mini_portile (0.6.0)
287   - minitest (5.3.4)
288   - multi_json (1.10.1)
  286 + mini_portile (0.5.3)
  287 + minitest (4.7.5)
  288 + multi_json (1.10.0)
289 289 multi_xml (0.5.5)
290 290 multipart-post (1.2.0)
291 291 mysql2 (0.3.16)
... ... @@ -293,8 +293,8 @@ GEM
293 293 net-scp (1.1.2)
294 294 net-ssh (>= 2.6.5)
295 295 net-ssh (2.8.0)
296   - nokogiri (1.6.2.1)
297   - mini_portile (= 0.6.0)
  296 + nokogiri (1.6.1)
  297 + mini_portile (~> 0.5.0)
298 298 nprogress-rails (0.1.2.3)
299 299 oauth (0.4.7)
300 300 oauth2 (0.8.1)
... ... @@ -326,9 +326,9 @@ GEM
326 326 orm_adapter (0.5.0)
327 327 pg (0.15.1)
328 328 phantomjs (1.9.2.0)
329   - poltergeist (1.5.1)
330   - capybara (~> 2.1)
331   - cliver (~> 0.3.1)
  329 + poltergeist (1.4.1)
  330 + capybara (~> 2.1.0)
  331 + cliver (~> 0.2.1)
332 332 multi_json (~> 1.0)
333 333 websocket-driver (>= 0.2.0)
334 334 polyglot (0.3.4)
... ... @@ -562,7 +562,7 @@ GEM
562 562 webmock (1.16.0)
563 563 addressable (>= 2.2.7)
564 564 crack (>= 0.3.2)
565   - websocket-driver (0.3.3)
  565 + websocket-driver (0.3.1)
566 566 xpath (2.0.0)
567 567 nokogiri (~> 1.3)
568 568  
... ... @@ -578,7 +578,7 @@ DEPENDENCIES
578 578 better_errors
579 579 binding_of_caller
580 580 bootstrap-sass (~> 3.0)
581   - capybara (~> 2.2.1)
  581 + capybara
582 582 carrierwave
583 583 coffee-rails
584 584 colored
... ... @@ -635,7 +635,7 @@ DEPENDENCIES
635 635 omniauth-twitter
636 636 org-ruby
637 637 pg
638   - poltergeist (~> 1.5.1)
  638 + poltergeist (~> 1.4.1)
639 639 protected_attributes
640 640 pry
641 641 quiet_assets (~> 1.0.1)
... ...
features/support/env.rb
  Diff comments   View file @08c3c06
... ... @@ -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: 90)
  31 + Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60)
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 @08c3c06
1   -RSpec.configure do |config|
2   - config.around(:each) do
3   - DatabaseCleaner.clean_with(:truncation)
4   - end
5   -
6   - config.around(:each) do
7   - DatabaseCleaner.strategy = :transaction
8   - end
  1 +require 'database_cleaner'
9 2  
10   - config.around(:each, js: true) do
11   - DatabaseCleaner.strategy = :truncation
12   - end
  3 +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
13 11  
14   - config.before(:each) do
15   - DatabaseCleaner.start
  12 + unless example.metadata[:no_db]
  13 + DatabaseCleaner.start
  14 + end
16 15 end
17 16  
18   - config.after(:each) do
19   - DatabaseCleaner.clean
  17 + config.after do
  18 + unless example.metadata[:no_db]
  19 + DatabaseCleaner.clean
  20 + end
20 21 end
21 22 end
... ...