From b4b715f405843b2ee8de06b1fd245b29bb0ff442 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 20 Feb 2017 13:00:45 +0200 Subject: [PATCH] Extract registrar controller translations in admin area #279 --- .../admin/registrars_controller.rb | 8 ++++---- app/views/admin/registrars/_form.haml | 4 ++-- app/views/admin/registrars/index.haml | 2 +- config/locales/admin/registrars.en.yml | 16 +++++++++++++++ config/locales/en.yml | 4 ---- spec/features/admin/registrars/create_spec.rb | 20 +++++++++++++++++++ spec/features/admin/registrars/edit_spec.rb | 18 +++++++++++++++++ 7 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 spec/features/admin/registrars/create_spec.rb create mode 100644 spec/features/admin/registrars/edit_spec.rb diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index 611687f9b..d29ce40d3 100644 --- a/app/controllers/admin/registrars_controller.rb +++ b/app/controllers/admin/registrars_controller.rb @@ -23,10 +23,10 @@ class Admin::RegistrarsController < AdminController @registrar.accounts.create!(account_type: Account::CASH, currency: 'EUR') end - flash[:notice] = I18n.t('registrar_added') + flash[:notice] = t('.created') redirect_to [:admin, @registrar] rescue ActiveRecord::RecordInvalid - flash.now[:alert] = I18n.t('failed_to_add_registrar') + flash.now[:alert] = t('.not_created') render 'new' end end @@ -35,10 +35,10 @@ class Admin::RegistrarsController < AdminController def update if @registrar.update(registrar_params) - flash[:notice] = I18n.t('registrar_updated') + flash[:notice] = t('.updated') redirect_to [:admin, @registrar] else - flash.now[:alert] = I18n.t('failed_to_update_registrar') + flash.now[:alert] = t('.not_updated') render 'edit' end end diff --git a/app/views/admin/registrars/_form.haml b/app/views/admin/registrars/_form.haml index 48cfc8066..6f80abba6 100644 --- a/app/views/admin/registrars/_form.haml +++ b/app/views/admin/registrars/_form.haml @@ -75,7 +75,7 @@ .col-md-8 .panel.panel-default .panel-heading.clearfix - .pull-left= t(:misc) + .pull-left= t('.misc') .panel-body .form-group .col-md-4.control-label @@ -91,4 +91,4 @@ %hr .row .col-md-8.text-right - = button_tag(t(:save), class: 'btn btn-primary') + = button_tag(t(".#{f.object.new_record? ? 'create' : 'update'}_btn"), class: 'btn btn-success') diff --git a/app/views/admin/registrars/index.haml b/app/views/admin/registrars/index.haml index 4e1c78294..ea9f7b312 100644 --- a/app/views/admin/registrars/index.haml +++ b/app/views/admin/registrars/index.haml @@ -1,5 +1,5 @@ - content_for :actions do - = link_to(t(:new), new_admin_registrar_path, class: 'btn btn-primary') + = link_to(t('.new_btn'), new_admin_registrar_path, class: 'btn btn-primary') = render 'shared/title', name: t(:registrars) .row diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml index 20da1a5ff..b30ad456e 100644 --- a/config/locales/admin/registrars.en.yml +++ b/config/locales/admin/registrars.en.yml @@ -1,7 +1,23 @@ en: admin: registrars: + index: + new_btn: New registrar + show: new_api_use_btn: New API user active: Active api_users: API users + + create: + created: Registrar has been successfully created + not_created: Unable to create registrar + + update: + updated: Registrar has been successfully updated + not_updated: Unable to update registrar + + form: + misc: Miscellaneous + create_btn: Create registrar + update_btn: Update registrar diff --git a/config/locales/en.yml b/config/locales/en.yml index d266cdfdf..aae8ae846 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -394,14 +394,10 @@ en: history: 'History' new_registrar: 'New registrar' - registrar_added: 'Registrar added!' - failed_to_add_registrar: 'Failed to add registrar' registrar_details: 'Registrar details' vat_no: 'VAT no' edit_registrar: 'Edit registrar' back_to_registrar: 'Back to registrar' - registrar_updated: 'Registrar updated' - failed_to_update_registrar: 'Failed to update registrar' registrar_deleted: 'Registrar deleted' failed_to_delete_registrar: 'Failed to delete registrar' diff --git a/spec/features/admin/registrars/create_spec.rb b/spec/features/admin/registrars/create_spec.rb new file mode 100644 index 000000000..24cc8bc2a --- /dev/null +++ b/spec/features/admin/registrars/create_spec.rb @@ -0,0 +1,20 @@ +require 'rails_helper' + +RSpec.feature 'New registrar' do + background do + sign_in_to_admin_area + end + + it 'creates registrar' do + visit admin_registrars_url + click_link_or_button 'New registrar' + + fill_in 'registrar[name]', with: 'test' + fill_in 'registrar[reg_no]', with: '1234567' + fill_in 'registrar[email]', with: 'test@test.com' + fill_in 'registrar[code]', with: 'test' + click_link_or_button 'Create registrar' + + expect(page).to have_text('Registrar has been successfully created') + end +end diff --git a/spec/features/admin/registrars/edit_spec.rb b/spec/features/admin/registrars/edit_spec.rb new file mode 100644 index 000000000..dd619efa6 --- /dev/null +++ b/spec/features/admin/registrars/edit_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.feature 'Edit registrar' do + given!(:registrar) { create(:registrar_with_unlimited_balance) } + + background do + sign_in_to_admin_area + end + + it 'updates registrar' do + visit admin_registrar_url(registrar) + click_link_or_button 'Edit' + + click_link_or_button 'Update registrar' + + expect(page).to have_text('Registrar has been successfully updated') + end +end