From b373f18f3960bfd9bb17f1caffe183340a3207e6 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 1 May 2017 21:49:54 +0300 Subject: [PATCH 1/6] Update capybara gem --- Gemfile | 3 +-- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index c9b2b3843..e0d624dff 100644 --- a/Gemfile +++ b/Gemfile @@ -128,8 +128,7 @@ group :development do end group :development, :test do - # test stack - gem 'capybara', '2.4.4' + gem 'capybara' gem 'rspec-rails', '3.5.2' gem 'fabrication', '2.13.2' # Replacement for fixtures gem 'phantomjs-binaries', '1.9.2.4' diff --git a/Gemfile.lock b/Gemfile.lock index 208306b38..9150b99cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,8 @@ GEM bundler (~> 1.2) thor (~> 0.18) cancancan (1.11.0) - capybara (2.4.4) + capybara (2.13.0) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -564,7 +565,7 @@ DEPENDENCIES bullet (= 4.14.7) bundler-audit cancancan (= 1.11.0) - capybara (= 2.4.4) + capybara codeclimate-test-reporter (~> 1.0.0) coderay (= 1.1.0) coffee-rails (= 4.1.0) From 2a3b526069337fdabb87337c357863dacba546fa Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 1 May 2017 21:58:51 +0300 Subject: [PATCH 2/6] Release rspec-rails gem version --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e0d624dff..02c6d1dfe 100644 --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ end group :development, :test do gem 'capybara' - gem 'rspec-rails', '3.5.2' + gem 'rspec-rails', '~> 3.5' gem 'fabrication', '2.13.2' # Replacement for fixtures gem 'phantomjs-binaries', '1.9.2.4' gem 'phantomjs', '1.9.8.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9150b99cd..017afee4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -619,7 +619,7 @@ DEPENDENCIES rails-settings-cached (= 0.4.1) ransack (= 1.5.1) rest-client - rspec-rails (= 3.5.2) + rspec-rails (~> 3.5) rubocop (= 0.48.1) rubycritic (= 3.2.0) sass-rails (= 5.0.6) From 929888eb0e8ff742d2ed6ef56d6491bd3a5daeb6 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 1 May 2017 22:18:41 +0300 Subject: [PATCH 3/6] Update phantomjs gem --- Gemfile | 4 ++-- Gemfile.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 02c6d1dfe..7b4006204 100644 --- a/Gemfile +++ b/Gemfile @@ -131,8 +131,8 @@ group :development, :test do gem 'capybara' gem 'rspec-rails', '~> 3.5' gem 'fabrication', '2.13.2' # Replacement for fixtures - gem 'phantomjs-binaries', '1.9.2.4' - gem 'phantomjs', '1.9.8.0' + gem 'phantomjs-binaries' + gem 'phantomjs' gem 'poltergeist', '1.6.0' # We are using PhantomJS instead gem 'launchy', '2.4.3' # for opening browser automatically diff --git a/Gemfile.lock b/Gemfile.lock index 017afee4d..1dfae8c9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,7 +337,7 @@ GEM pdfkit (0.6.2) pg (0.19.0) phantomjs (1.9.8.0) - phantomjs-binaries (1.9.2.4) + phantomjs-binaries (2.1.1.1) sys-uname (= 0.9.0) poltergeist (1.6.0) capybara (~> 2.1) @@ -606,8 +606,8 @@ DEPENDENCIES paper_trail! pdfkit (= 0.6.2) pg (= 0.19.0) - phantomjs (= 1.9.8.0) - phantomjs-binaries (= 1.9.2.4) + phantomjs + phantomjs-binaries poltergeist (= 1.6.0) pry (= 0.10.1) puma From b05459d4392083fa4535f8cd66f01bb3dc07965f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 1 May 2017 22:19:45 +0300 Subject: [PATCH 4/6] Update poltergeist gem --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7b4006204..0f9ba3511 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ group :development, :test do gem 'fabrication', '2.13.2' # Replacement for fixtures gem 'phantomjs-binaries' gem 'phantomjs' - gem 'poltergeist', '1.6.0' # We are using PhantomJS instead + gem 'poltergeist' gem 'launchy', '2.4.3' # for opening browser automatically # debug diff --git a/Gemfile.lock b/Gemfile.lock index 1dfae8c9b..3495e9eea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) cancancan (1.11.0) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -339,10 +339,9 @@ GEM phantomjs (1.9.8.0) phantomjs-binaries (2.1.1.1) sys-uname (= 0.9.0) - poltergeist (1.6.0) + poltergeist (1.14.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyamorous (1.3.1) activerecord (>= 3.0) @@ -608,7 +607,7 @@ DEPENDENCIES pg (= 0.19.0) phantomjs phantomjs-binaries - poltergeist (= 1.6.0) + poltergeist pry (= 0.10.1) puma que (= 0.10.0) From bb08deca8900e522ac26c23d6c1182175a038f00 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 2 May 2017 12:21:00 +0300 Subject: [PATCH 5/6] Add missing env background image --- .../images/registrar/{bg-alpha.png => bg-test.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename app/assets/images/registrar/{bg-alpha.png => bg-test.png} (100%) diff --git a/app/assets/images/registrar/bg-alpha.png b/app/assets/images/registrar/bg-test.png similarity index 100% rename from app/assets/images/registrar/bg-alpha.png rename to app/assets/images/registrar/bg-test.png From 8134b0ded6cfabf3b8ca9998b4c0c8ad78ceb9d2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 2 May 2017 12:22:35 +0300 Subject: [PATCH 6/6] Disable external connections in test env --- spec/spec_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 664043716..e5e131454 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,6 @@ require 'webmock/rspec' +WebMock.disable_net_connect!(allow_localhost: true) + if ENV['TRAVIS'] require 'simplecov' SimpleCov.start