Skip to content

Commit

Permalink
Merge b40ae84 into 3ac1284
Browse files Browse the repository at this point in the history
  • Loading branch information
alxndr committed Feb 21, 2016
2 parents 3ac1284 + b40ae84 commit ba7ff5b
Show file tree
Hide file tree
Showing 6 changed files with 888 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'bitters'
gem 'bugsnag'
gem 'google-search'
gem 'htmlentities'
gem 'lyriki'
gem 'lyriki', '~> 1.0.1'
gem 'neat'
gem 'newrelic_rpm', '>= 3.5.3.25'
gem 'nokogiri'
Expand Down Expand Up @@ -50,6 +50,6 @@ end
group :test do
gem 'codeclimate-test-reporter', require: false
gem 'coveralls', require: false
gem 'vcr'
gem 'vcr', '~> 2.9.3'
gem 'webmock'
end
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ GEM
loofah (2.0.1)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
lyriki (0.0.1)
lyriki (1.0.1)
json
nokogiri
mail (2.6.3)
Expand Down Expand Up @@ -331,7 +331,7 @@ DEPENDENCIES
guard-rails
guard-rspec
htmlentities
lyriki
lyriki (~> 1.0.1)
neat
newrelic_rpm (>= 3.5.3.25)
nokogiri
Expand All @@ -348,5 +348,5 @@ DEPENDENCIES
skylight
uglifier
unicorn
vcr
vcr (~> 2.9.3)
webmock
2 changes: 1 addition & 1 deletion spec/features/lyrics_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
feature 'lyrics' do

before do
VCR.use_cassette 'artist_api_responses', record: :none do
VCR.use_cassette 'artist_api_responses' do
visit '/text-from-lyrics-by/blind-faith/2/sentences'
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/features/static_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
end

it 'sends you to a new page' do
VCR.use_cassette 'artist_search_and_lyrics', record: :none do
VCR.use_cassette 'artist_search_and_lyrics' do
fill_in 'artist', with: 'phish'
fill_in 'How much text are you looking for?', with: '2'
choose 'sentences'
Expand Down

0 comments on commit ba7ff5b

Please sign in to comment.