From 26f1ef9537c0a0bc3fb49a22ed5879f2750613bd Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Fri, 28 Apr 2017 23:46:40 +0300 Subject: [PATCH 01/10] fix sorted_country list #489 --- lib/sorted_country.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sorted_country.rb b/lib/sorted_country.rb index e831c007b..8b69d951a 100644 --- a/lib/sorted_country.rb +++ b/lib/sorted_country.rb @@ -37,7 +37,7 @@ class SortedCountry def all_sorted_truncated @all_sorted_truncated ||= - all_sorted.map { |country| [truncate(name, length: 26), country.alpha2] } + all_sorted.map { |country| [country.name.truncate(26), country.alpha2] } end end end From b373f18f3960bfd9bb17f1caffe183340a3207e6 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 1 May 2017 21:49:54 +0300 Subject: [PATCH 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 From 7fe1b641c7c97213acdb5843d7726b52ea5f722a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 2 May 2017 14:14:34 +0300 Subject: [PATCH 08/10] Set default period in new/renew domain forms in registrar area #495 --- .../registrar/domains_controller.rb | 2 ++ app/models/depp/domain.rb | 4 ++++ spec/features/registrar/domains/new_spec.rb | 14 ++++++++++++++ spec/features/registrar/domains/renew_spec.rb | 18 ++++++++++++++++++ spec/models/depp/domain_spec.rb | 9 +++++++++ 5 files changed, 47 insertions(+) create mode 100644 spec/features/registrar/domains/new_spec.rb create mode 100644 spec/features/registrar/domains/renew_spec.rb create mode 100644 spec/models/depp/domain_spec.rb diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index a75469de3..76467ce79 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -85,6 +85,7 @@ class Registrar def new authorize! :create, Depp::Domain @domain_params = Depp::Domain.default_params + @domain_params[:period] = Depp::Domain.default_period end def create @@ -140,6 +141,7 @@ class Registrar @data = @domain.renew(params) render 'renew_index' and return unless response_ok? else + params[:period] = Depp::Domain.default_period render 'renew_index' end end diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 2b35a695c..1351b2672 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -145,6 +145,10 @@ module Depp end class << self + def default_period + '1y' + end + def default_params ret = {} diff --git a/spec/features/registrar/domains/new_spec.rb b/spec/features/registrar/domains/new_spec.rb new file mode 100644 index 000000000..4dd1d85d5 --- /dev/null +++ b/spec/features/registrar/domains/new_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.feature 'New domain in registrar area', settings: false do + background do + sign_in_to_registrar_area + end + + it 'has default period' do + visit registrar_domains_path + click_link_or_button t('new') + + expect(page).to have_field('domain_period', with: Depp::Domain.default_period) + end +end diff --git a/spec/features/registrar/domains/renew_spec.rb b/spec/features/registrar/domains/renew_spec.rb new file mode 100644 index 000000000..1d6ab0a7e --- /dev/null +++ b/spec/features/registrar/domains/renew_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.feature 'Renew domain in registrar area' do + given!(:registrar) { create(:registrar) } + given!(:user) { create(:api_user, registrar: registrar) } + given!(:domain) { create(:domain, registrar: registrar) } + + background do + sign_in_to_registrar_area(user: user) + end + + it 'has default period' do + visit registrar_domains_path + click_link_or_button t('renew') + + expect(page).to have_field('period', with: Depp::Domain.default_period) + end +end diff --git a/spec/models/depp/domain_spec.rb b/spec/models/depp/domain_spec.rb new file mode 100644 index 000000000..c780e6a00 --- /dev/null +++ b/spec/models/depp/domain_spec.rb @@ -0,0 +1,9 @@ +require 'rails_helper' + +RSpec.describe Depp::Domain do + describe '::default_period', db: false, settings: false do + it 'returns default period' do + expect(described_class.default_period).to eq('1y') + end + end +end From 070eeb246c2f7a26d120845234390a4df4a4d944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 2 May 2017 16:45:54 +0300 Subject: [PATCH 09/10] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d44783e0..8819d2664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ +02.05.2017 +* Set default period value of domain create and renew operations to 1 year in the Registrar portal [#495](https://github.com/internetee/registry/issues/495) + +01.05.2017 +* support for short and long regsitration periods - 3m to 10y [#475](https://github.com/internetee/registry/issues/475) +* better race condition handling on domain renew [#430](https://github.com/internetee/registry/issues/430) + 05.04.2017 * Fixed validation error on valid legaldocs in the portal for registrars [#432](https://github.com/internetee/registry/issues/432) * Updated Ruby, nokogiri and variouse other dependent gems to fix security issues +* Template selection for setting ForceDelete status in admin interface and new template for deceased registrant [#268](https://github.com/internetee/registry/issues/268) 14.03.2017 * Improved phone number validation [#386](https://github.com/internetee/registry/issues/386) From 7e8c4077a6eb447fa8ace11bab43544c1129a19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 2 May 2017 16:46:54 +0300 Subject: [PATCH 10/10] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8819d2664..abb1dd2bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ * Set default period value of domain create and renew operations to 1 year in the Registrar portal [#495](https://github.com/internetee/registry/issues/495) 01.05.2017 -* support for short and long regsitration periods - 3m to 10y [#475](https://github.com/internetee/registry/issues/475) -* better race condition handling on domain renew [#430](https://github.com/internetee/registry/issues/430) +* Support for short and long regsitration periods - from 3m to 10y [#475](https://github.com/internetee/registry/issues/475) +* Improved race condition handling on domain renew [#430](https://github.com/internetee/registry/issues/430) 05.04.2017 * Fixed validation error on valid legaldocs in the portal for registrars [#432](https://github.com/internetee/registry/issues/432)