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
@@ -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", '~> 2.2.1' 202 + gem "capybara"
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.5.1' 225 + gem 'poltergeist', '~> 1.4.1'
226 226
227 gem 'jasmine', '2.0.2' 227 gem 'jasmine', '2.0.2'
228 228
@@ -62,7 +62,7 @@ GEM @@ -62,7 +62,7 @@ GEM
62 celluloid (0.15.2) 62 celluloid (0.15.2)
63 timers (~> 1.1.0) 63 timers (~> 1.1.0)
64 charlock_holmes (0.6.9.4) 64 charlock_holmes (0.6.9.4)
65 - cliver (0.3.2) 65 + cliver (0.2.2)
66 code_analyzer (0.4.3) 66 code_analyzer (0.4.3)
67 sexp_processor 67 sexp_processor
68 coderay (1.1.0) 68 coderay (1.1.0)
@@ -283,9 +283,9 @@ GEM @@ -283,9 +283,9 @@ GEM
283 treetop (~> 1.4.8) 283 treetop (~> 1.4.8)
284 method_source (0.8.2) 284 method_source (0.8.2)
285 mime-types (1.25.1) 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 multi_xml (0.5.5) 289 multi_xml (0.5.5)
290 multipart-post (1.2.0) 290 multipart-post (1.2.0)
291 mysql2 (0.3.16) 291 mysql2 (0.3.16)
@@ -293,8 +293,8 @@ GEM @@ -293,8 +293,8 @@ GEM
293 net-scp (1.1.2) 293 net-scp (1.1.2)
294 net-ssh (>= 2.6.5) 294 net-ssh (>= 2.6.5)
295 net-ssh (2.8.0) 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 nprogress-rails (0.1.2.3) 298 nprogress-rails (0.1.2.3)
299 oauth (0.4.7) 299 oauth (0.4.7)
300 oauth2 (0.8.1) 300 oauth2 (0.8.1)
@@ -326,9 +326,9 @@ GEM @@ -326,9 +326,9 @@ GEM
326 orm_adapter (0.5.0) 326 orm_adapter (0.5.0)
327 pg (0.15.1) 327 pg (0.15.1)
328 phantomjs (1.9.2.0) 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 multi_json (~> 1.0) 332 multi_json (~> 1.0)
333 websocket-driver (>= 0.2.0) 333 websocket-driver (>= 0.2.0)
334 polyglot (0.3.4) 334 polyglot (0.3.4)
@@ -562,7 +562,7 @@ GEM @@ -562,7 +562,7 @@ GEM
562 webmock (1.16.0) 562 webmock (1.16.0)
563 addressable (>= 2.2.7) 563 addressable (>= 2.2.7)
564 crack (>= 0.3.2) 564 crack (>= 0.3.2)
565 - websocket-driver (0.3.3) 565 + websocket-driver (0.3.1)
566 xpath (2.0.0) 566 xpath (2.0.0)
567 nokogiri (~> 1.3) 567 nokogiri (~> 1.3)
568 568
@@ -578,7 +578,7 @@ DEPENDENCIES @@ -578,7 +578,7 @@ DEPENDENCIES
578 better_errors 578 better_errors
579 binding_of_caller 579 binding_of_caller
580 bootstrap-sass (~> 3.0) 580 bootstrap-sass (~> 3.0)
581 - capybara (~> 2.2.1) 581 + capybara
582 carrierwave 582 carrierwave
583 coffee-rails 583 coffee-rails
584 colored 584 colored
@@ -635,7 +635,7 @@ DEPENDENCIES @@ -635,7 +635,7 @@ DEPENDENCIES
635 omniauth-twitter 635 omniauth-twitter
636 org-ruby 636 org-ruby
637 pg 637 pg
638 - poltergeist (~> 1.5.1) 638 + poltergeist (~> 1.4.1)
639 protected_attributes 639 protected_attributes
640 pry 640 pry
641 quiet_assets (~> 1.0.1) 641 quiet_assets (~> 1.0.1)
features/support/env.rb
  Diff comments   View file @08c3c06
@@ -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: 90) 31 + Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60)
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 @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 end 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 end 21 end
21 end 22 end