diff --git a/Gemfile b/Gemfile index c9b2b3843..0f9ba3511 100644 --- a/Gemfile +++ b/Gemfile @@ -128,13 +128,12 @@ group :development do end group :development, :test do - # test stack - gem 'capybara', '2.4.4' - gem 'rspec-rails', '3.5.2' + 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 'poltergeist', '1.6.0' # We are using PhantomJS instead + gem 'phantomjs-binaries' + gem 'phantomjs' + gem 'poltergeist' gem 'launchy', '2.4.3' # for opening browser automatically # debug diff --git a/Gemfile.lock b/Gemfile.lock index 208306b38..3495e9eea 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.14.0) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -336,12 +337,11 @@ 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) + 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) @@ -564,7 +564,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) @@ -605,9 +605,9 @@ DEPENDENCIES paper_trail! pdfkit (= 0.6.2) pg (= 0.19.0) - phantomjs (= 1.9.8.0) - phantomjs-binaries (= 1.9.2.4) - poltergeist (= 1.6.0) + phantomjs + phantomjs-binaries + poltergeist pry (= 0.10.1) puma que (= 0.10.0) @@ -618,7 +618,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) 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 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