From 93ca68a48e85ec3d0687ef6383157ae97e75d6ea Mon Sep 17 00:00:00 2001 From: pikesley Date: Mon, 30 Apr 2018 15:46:08 +0100 Subject: [PATCH] Revert "s/Add/\+/g" --- Gemfile | 2 +- Gemfile.lock | 5 +---- app/presenters/model_presenter.rb | 2 +- spec/presenters/model_presenter_spec.rb | 2 +- spec/requests/carbohydrate_intake_spec.rb | 2 +- spec/requests/glucose_measurements_spec.rb | 2 +- spec/requests/medication_events_spec.rb | 2 +- spec/requests/welcome_spec.rb | 8 ++++---- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 31ac1f3..48edc37 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby File.read '.ruby-version' +ruby '2.3.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.5' diff --git a/Gemfile.lock b/Gemfile.lock index 706cc33..52a2553 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,8 +315,5 @@ DEPENDENCIES web-console (~> 2.0) xml-simple -RUBY VERSION - ruby 2.3.0p0 - BUNDLED WITH - 1.16.1 + 1.11.2 diff --git a/app/presenters/model_presenter.rb b/app/presenters/model_presenter.rb index 66490df..158ae61 100644 --- a/app/presenters/model_presenter.rb +++ b/app/presenters/model_presenter.rb @@ -13,7 +13,7 @@ def as_add_button css_class = nil css_classes = ['btn', "#{button_name}"] css_classes.push css_class if css_class path = "new_#{underscore}_path" - link_to "+ #{model.short_name}", + link_to "Add #{model.short_name}", url_helpers.send(path), class: css_classes.join(' ') end diff --git a/spec/presenters/model_presenter_spec.rb b/spec/presenters/model_presenter_spec.rb index c7565ed..9eb5f31 100644 --- a/spec/presenters/model_presenter_spec.rb +++ b/spec/presenters/model_presenter_spec.rb @@ -6,7 +6,7 @@ describe '#as_add_button' do let(:mp) { GlucoseMeasurement.model_presenter } it 'generates an add_new button' do - expect(mp.as_add_button).to eq '+ Glucose' + expect(mp.as_add_button).to eq 'Add Glucose' end end end diff --git a/spec/requests/carbohydrate_intake_spec.rb b/spec/requests/carbohydrate_intake_spec.rb index c209ce0..00d7ed4 100644 --- a/spec/requests/carbohydrate_intake_spec.rb +++ b/spec/requests/carbohydrate_intake_spec.rb @@ -7,7 +7,7 @@ visit carbohydrate_intakes_url(as: user) expect(page).to have_content 'Carbs' - expect(page).to have_link '+ Carbs', href: '/carbs/new' + expect(page).to have_link 'Add Carbs', href: '/carbs/new' end it 'focuses the field correctly' do diff --git a/spec/requests/glucose_measurements_spec.rb b/spec/requests/glucose_measurements_spec.rb index 39de330..6f53a05 100644 --- a/spec/requests/glucose_measurements_spec.rb +++ b/spec/requests/glucose_measurements_spec.rb @@ -82,7 +82,7 @@ click_link 'Delete' expect(GlucoseMeasurement.count).to eq 2 - expect(page).to have_link '+ Glucose', href: '/glucose/new' + expect(page).to have_link 'Add Glucose', href: '/glucose/new' within 'th' do expect(page).to have_content 'Sunday January 31st' end diff --git a/spec/requests/medication_events_spec.rb b/spec/requests/medication_events_spec.rb index b7a1a62..9045f67 100644 --- a/spec/requests/medication_events_spec.rb +++ b/spec/requests/medication_events_spec.rb @@ -81,7 +81,7 @@ click_link 'Delete' expect(MedicationEvent.count).to eq 2 - expect(page).to have_link '+ Meds', href: '/meds/new' + expect(page).to have_link 'Add Meds', href: '/meds/new' expect(page).to_not have_content 'Sunday January 28th' end end diff --git a/spec/requests/welcome_spec.rb b/spec/requests/welcome_spec.rb index dbb4697..7b4f476 100644 --- a/spec/requests/welcome_spec.rb +++ b/spec/requests/welcome_spec.rb @@ -8,10 +8,10 @@ visit root_path(as: user) within(:css, 'div#add-links') do expect(page.all('a').map { |link| link.text } ).to eq [ - '+ Glucose', - '+ Meds', - '+ Carbs', - '+ Exercise' + 'Add Glucose', + 'Add Meds', + 'Add Carbs', + 'Add Exercise' ] end end