Skip to content

Commit

Permalink
Merge pull request #179 from pikesley/revert-174-shrink-buttons
Browse files Browse the repository at this point in the history
Revert "s/Add/\+/g"
  • Loading branch information
pikesley committed Apr 30, 2018
2 parents 478312d + 93ca68a commit 6d0650e
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion 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'
Expand Down
5 changes: 1 addition & 4 deletions Gemfile.lock
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/presenters/model_presenter.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/presenters/model_presenter_spec.rb
Expand Up @@ -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 '<a class="btn btn-glucose-measurement" href="/glucose/new">+ Glucose</a>'
expect(mp.as_add_button).to eq '<a class="btn btn-glucose-measurement" href="/glucose/new">Add Glucose</a>'
end
end
end
2 changes: 1 addition & 1 deletion spec/requests/carbohydrate_intake_spec.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/glucose_measurements_spec.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/medication_events_spec.rb
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions spec/requests/welcome_spec.rb
Expand Up @@ -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
Expand Down

0 comments on commit 6d0650e

Please sign in to comment.