From f099900308d766a05cf8fca01ae7096d4bf92bcb Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 15 Apr 2015 10:06:48 +0300 Subject: [PATCH 1/3] Updated invoices spec --- app/views/registrar/deposits/new.haml | 2 +- spec/features/registrar/invoices_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/registrar/deposits/new.haml b/app/views/registrar/deposits/new.haml index 6557316f7..695068ecc 100644 --- a/app/views/registrar/deposits/new.haml +++ b/app/views/registrar/deposits/new.haml @@ -17,6 +17,6 @@ .row .col-md-12.text-right - = button_tag(t('save'), class: 'btn btn-primary') + = button_tag(t(:add), class: 'btn btn-primary') diff --git a/spec/features/registrar/invoices_spec.rb b/spec/features/registrar/invoices_spec.rb index 2632aa8ef..845a79444 100644 --- a/spec/features/registrar/invoices_spec.rb +++ b/spec/features/registrar/invoices_spec.rb @@ -21,7 +21,7 @@ feature 'Invoices', type: :feature do it 'should navigate to the domains index page' do current_path.should == '/registrar' - click_link 'Accounting' + click_link 'Billing' current_path.should == '/registrar/invoices' page.should have_text('Your current credit account balance is') From c975d048f3d35fc62e57f991692c862ed16c8282 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 15 Apr 2015 10:17:06 +0300 Subject: [PATCH 2/3] Update schema --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index ac3748deb..366b80f73 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150414124630) do +ActiveRecord::Schema.define(version: 20150414151357) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From fd8d6250e66d2f05d5b2f22a342e0f20c79624b5 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 15 Apr 2015 10:25:39 +0300 Subject: [PATCH 3/3] Improved fred database info message --- app/models/legacy/db.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/legacy/db.rb b/app/models/legacy/db.rb index 0c8e6624a..1cb635b3b 100644 --- a/app/models/legacy/db.rb +++ b/app/models/legacy/db.rb @@ -4,7 +4,7 @@ module Legacy begin establish_connection :fred rescue ActiveRecord::AdapterNotSpecified => e - logger.info "'fred' database not configured, please update your database.yml file: #{e}" + logger.info "Legacy 'fred' database support is currently disabled because #{e}" end def readonly?