diff --git a/Gemfile.lock b/Gemfile.lock index 48194b80..241cbb00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,6 +221,8 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt + haml-lint (0.999.999) + haml_lint haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) @@ -703,8 +705,8 @@ DEPENDENCIES geckodriver-helper gravtastic guard-rspec + haml-lint haml-rails - haml_lint iso-639 jquery-datatables jquery-rails @@ -758,7 +760,6 @@ DEPENDENCIES rqrcode rspec-activemodel-mocks rspec-rails - rubocop rubocop-rspec ruby-oembed sass-rails (>= 4.0.2) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index edadc869..403c797d 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -65,19 +65,16 @@ describe ApplicationHelper, type: :helper do describe 'navigation title link' do it 'should default to OSEM' do ENV.delete('OSEM_NAME') - # TODO:Snap!Con: expect(nav_root_link_for(nil)).to match 'OSEM' - expect(nav_root_link_for(nil)).to match image_tag('snapcon_logo.png') + expect(nav_root_link_for(nil)).to include image_tag('snapcon_logo.png', alt: 'OSEM') end it 'should use the environment variable' do ENV['OSEM_NAME'] = Faker::Company.name + "'" - # expect(nav_root_link_for(nil)).to match h(ENV['OSEM_NAME']) - expect(nav_root_link_for(nil)).to match image_tag('snapcon_logo.png') + expect(nav_root_link_for(nil)).to include image_tag('snapcon_logo.png', alt: ENV['OSEM_NAME']) end it 'should use the conference organization name' do - # expect(nav_root_link_for(conference)).to match h(conference.organization.name) - expect(nav_root_link_for(nil)).to match image_tag('snapcon_logo.png') + expect(nav_root_link_for(nil)).to include image_tag('snapcon_logo.png', alt: conference.title) end end end