Merge branch 'master' of github.com:domify/registry

Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-04-15 11:33:20 +03:00
commit 629f125ba6
4 changed files with 4 additions and 4 deletions

View file

@ -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')