fixes conflicts with budgets

2017-01-09 13:33:01 +01:00
parent be10972406 b7788e0a1a
commit f2d23b56e0
36 changed files with 248 additions and 255 deletions
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -23,7 +23,7 @@ feature 'Admin budgets' do
      visit admin_budgets_path

      expect(page).to have_content(budget.name)
-      expect(page).to have_content(I18n.t("budget.phase.#{budget.phase}"))
+      expect(page).to have_content(I18n.t("budgets.phase.#{budget.phase}"))
    end

    scenario 'Filters by phase' do