From 2f446cf0568e808f109485cb229ce7e42bd54456 Mon Sep 17 00:00:00 2001 From: kikito Date: Tue, 13 Dec 2016 12:39:53 +0100 Subject: [PATCH] Renames "open" to "current" to avoid issues with existing method called "open" --- app/controllers/admin/budgets_controller.rb | 2 +- spec/features/admin/budgets_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb index 2dd210947..e5e73a346 100644 --- a/app/controllers/admin/budgets_controller.rb +++ b/app/controllers/admin/budgets_controller.rb @@ -2,7 +2,7 @@ class Admin::BudgetsController < Admin::BaseController include FeatureFlags feature_flag :budgets - has_filters %w{open finished}, only: :index + has_filters %w{current finished}, only: :index load_and_authorize_resource diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb index b01c798cc..170a86cec 100644 --- a/spec/features/admin/budgets_spec.rb +++ b/spec/features/admin/budgets_spec.rb @@ -47,7 +47,7 @@ feature 'Admin budgets' do expect(page).to_not have_content(budget4.name) expect(page).to have_content(budget5.name) - click_link 'Open' + click_link 'Current' expect(page).to have_content(budget1.name) expect(page).to have_content(budget2.name) expect(page).to have_content(budget3.name) @@ -56,7 +56,7 @@ feature 'Admin budgets' do end scenario 'Current filter is properly highlighted' do - filters_links = {'open' => 'Open', 'finished' => 'Finished'} + filters_links = {'current' => 'Current', 'finished' => 'Finished'} visit admin_budgets_path @@ -158,4 +158,4 @@ feature 'Admin budgets' do end end -end \ No newline at end of file +end