From 0c7bf69ba2c3981da0a5b12825a317e3878e07d9 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Tue, 1 Apr 2014 18:32:22 +0000 Subject: [PATCH] Use one-liners in specs where possible --- .../controllers/api/application_controller_spec.rb | 8 ++------ spec/controllers/api/playlists_controller_spec.rb | 4 +--- spec/controllers/api/sessions_controller_spec.rb | 4 +--- spec/controllers/api/tracks_controller_spec.rb | 4 +--- spec/controllers/home_controller_spec.rb | 4 +--- spec/controllers/playlists_controller_spec.rb | 4 +--- spec/controllers/sounds_controller_spec.rb | 4 +--- spec/controllers/tracks_controller_spec.rb | 8 ++------ spec/features/home_spec.rb | 4 +--- spec/features/playlists_spec.rb | 4 +--- spec/features/tracks_spec.rb | 4 +--- spec/integration/api/playlists_spec.rb | 4 +--- spec/integration/api/tracks_spec.rb | 4 +--- spec/models/track_spec.rb | 12 +++--------- spec/models/user_spec.rb | 4 +--- spec/views/home/index.html.haml_spec.rb | 8 ++------ spec/views/playlists/edit.html.haml_spec.rb | 8 ++------ spec/views/playlists/index.html.haml_spec.rb | 6 +----- spec/views/playlists/new.html.haml_spec.rb | 14 ++++---------- spec/views/tracks/new.html.haml_spec.rb | 11 +++-------- spec/views/tracks/show.html.haml_spec.rb | 4 +--- spec/views/users/new.html.haml_spec.rb | 11 +++-------- 22 files changed, 35 insertions(+), 103 deletions(-) diff --git a/spec/controllers/api/application_controller_spec.rb b/spec/controllers/api/application_controller_spec.rb index 45b0a71..ddec1b6 100644 --- a/spec/controllers/api/application_controller_spec.rb +++ b/spec/controllers/api/application_controller_spec.rb @@ -3,14 +3,10 @@ require 'spec_helper' describe API::ApplicationController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } context 'CORS: Cross-Origin Ressource Sharing' do - before do - request.headers['Origin'] = 'http://origin.example/' - end + before { request.headers['Origin'] = 'http://origin.example/' } context 'preflight' do controller(API::ApplicationController) do diff --git a/spec/controllers/api/playlists_controller_spec.rb b/spec/controllers/api/playlists_controller_spec.rb index 3b51b7a..d680ddc 100644 --- a/spec/controllers/api/playlists_controller_spec.rb +++ b/spec/controllers/api/playlists_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe API::PlaylistsController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET index' do render_views diff --git a/spec/controllers/api/sessions_controller_spec.rb b/spec/controllers/api/sessions_controller_spec.rb index e118b70..546a97c 100644 --- a/spec/controllers/api/sessions_controller_spec.rb +++ b/spec/controllers/api/sessions_controller_spec.rb @@ -12,9 +12,7 @@ describe API::SessionsController do end context 'with valid credentials' do - before do - do_create - end + before { do_create } it 'signs the user in' do expect(controller.current_user).to eq user diff --git a/spec/controllers/api/tracks_controller_spec.rb b/spec/controllers/api/tracks_controller_spec.rb index 1fc08fb..b31008a 100644 --- a/spec/controllers/api/tracks_controller_spec.rb +++ b/spec/controllers/api/tracks_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe API::TracksController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET index' do render_views diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index f9c200a..8f1e1cb 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe HomeController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET index' do it 'assigns all playlists as @playlists' do diff --git a/spec/controllers/playlists_controller_spec.rb b/spec/controllers/playlists_controller_spec.rb index 7b28eb9..82703bd 100644 --- a/spec/controllers/playlists_controller_spec.rb +++ b/spec/controllers/playlists_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe PlaylistsController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET index' do it 'assigns all playlists as @playlists' do diff --git a/spec/controllers/sounds_controller_spec.rb b/spec/controllers/sounds_controller_spec.rb index 547f5ea..8f37a3c 100644 --- a/spec/controllers/sounds_controller_spec.rb +++ b/spec/controllers/sounds_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe SoundsController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET show' do let(:sound) { FactoryGirl.create(:sound) } diff --git a/spec/controllers/tracks_controller_spec.rb b/spec/controllers/tracks_controller_spec.rb index 93608ce..5f54731 100644 --- a/spec/controllers/tracks_controller_spec.rb +++ b/spec/controllers/tracks_controller_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe TracksController do include UserControllerHelpers - before do - sign_in - end + before { sign_in } describe 'GET show' do it 'assigns the requested track as @track' do @@ -46,9 +44,7 @@ describe TracksController do end context 'whith invalid params' do - before do - allow_any_instance_of(Track).to receive(:save) { false } - end + before { allow_any_instance_of(Track).to receive(:save) { false } } it 'assigns the track as @track' do do_create diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb index b776051..245db11 100644 --- a/spec/features/home_spec.rb +++ b/spec/features/home_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' feature 'Home page' do include UserIntegrationHelpers - background do - sign_in - end + background { sign_in } scenario 'displays playlists' do playlist = FactoryGirl.create(:playlist, name: 'Electro') diff --git a/spec/features/playlists_spec.rb b/spec/features/playlists_spec.rb index 0053ec8..df070c4 100644 --- a/spec/features/playlists_spec.rb +++ b/spec/features/playlists_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' feature 'Playlists' do include UserIntegrationHelpers - background do - sign_in - end + background { sign_in } scenario 'lists playlists' do FactoryGirl.create(:playlist, name: 'Electro') diff --git a/spec/features/tracks_spec.rb b/spec/features/tracks_spec.rb index ccf9707..487a07a 100644 --- a/spec/features/tracks_spec.rb +++ b/spec/features/tracks_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' feature 'Tracks' do include UserIntegrationHelpers - background do - sign_in - end + background { sign_in } scenario 'shows track' do track = FactoryGirl.create(:track, name: 'Mega song') diff --git a/spec/integration/api/playlists_spec.rb b/spec/integration/api/playlists_spec.rb index f45cb87..33cf9b0 100644 --- a/spec/integration/api/playlists_spec.rb +++ b/spec/integration/api/playlists_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' feature 'API playlists' do include UserIntegrationHelpers - background do - api_sign_in - end + background { api_sign_in } scenario 'creates playlist' do playlist = FactoryGirl.attributes_for :playlist diff --git a/spec/integration/api/tracks_spec.rb b/spec/integration/api/tracks_spec.rb index b89f506..09e18ea 100644 --- a/spec/integration/api/tracks_spec.rb +++ b/spec/integration/api/tracks_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' feature 'API tracks' do include UserIntegrationHelpers - background do - api_sign_in - end + background { api_sign_in } scenario 'lists tracks' do track_1 = FactoryGirl.create(:track_with_sound, name: 'Track 1') diff --git a/spec/models/track_spec.rb b/spec/models/track_spec.rb index be630e2..792d025 100644 --- a/spec/models/track_spec.rb +++ b/spec/models/track_spec.rb @@ -11,9 +11,7 @@ describe Track do it { should_not allow_mass_assignment_of :sounds } context 'with a file' do - before do - track.file = file - end + before { track.file = file } it { should be_valid } @@ -35,9 +33,7 @@ describe Track do describe '#sound' do context 'with a sound' do - before do - track.sounds << FactoryGirl.create(:sound) - end + before { track.sounds << FactoryGirl.create(:sound) } it 'returns a sound' do expect(track.sound).to be_a Sound @@ -53,9 +49,7 @@ describe Track do end context 'with a sound' do - before do - track.sounds << FactoryGirl.create(:sound) - end + before { track.sounds << FactoryGirl.create(:sound) } it 'returns true' do expect(track.sound?).to be true diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 0a4b1c3..979f83f 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -21,9 +21,7 @@ describe User do end context 'when password_confirmation does not match password' do - before do - user.password_confirmation = user.password + 'INVALID' - end + before { user.password_confirmation = user.password + 'INVALID' } it { should_not be_valid } end diff --git a/spec/views/home/index.html.haml_spec.rb b/spec/views/home/index.html.haml_spec.rb index 11c261d..2cb84fd 100644 --- a/spec/views/home/index.html.haml_spec.rb +++ b/spec/views/home/index.html.haml_spec.rb @@ -2,12 +2,8 @@ require 'spec_helper' describe 'home/index' do before do - assign :playlists, [ - mock_model(Playlist, name: 'Electro') - ] - assign :tracks, [ - mock_model(Track, name: 'Mega song') - ] + assign :playlists, [mock_model(Playlist, name: 'Electro')] + assign :tracks, [mock_model(Track, name: 'Mega song')] end it 'displays a list of playlists' do diff --git a/spec/views/playlists/edit.html.haml_spec.rb b/spec/views/playlists/edit.html.haml_spec.rb index 642ec1d..398b66c 100644 --- a/spec/views/playlists/edit.html.haml_spec.rb +++ b/spec/views/playlists/edit.html.haml_spec.rb @@ -1,13 +1,9 @@ require 'spec_helper' describe 'playlists/edit' do - let(:playlist) do - mock_model(Playlist).as_new_record.as_null_object - end + let(:playlist) { mock_model(Playlist).as_new_record.as_null_object } - before do - assign :playlist, playlist - end + before { assign :playlist, playlist } it 'renders a form to edit a playlist' do render diff --git a/spec/views/playlists/index.html.haml_spec.rb b/spec/views/playlists/index.html.haml_spec.rb index 590feaa..c0fd106 100644 --- a/spec/views/playlists/index.html.haml_spec.rb +++ b/spec/views/playlists/index.html.haml_spec.rb @@ -1,11 +1,7 @@ require 'spec_helper' describe 'playlists/index' do - before do - assign :playlists, [ - mock_model(Playlist, name: 'Electro') - ] - end + before { assign :playlists, [mock_model(Playlist, name: 'Electro')] } it 'displays a list of playlists' do render diff --git a/spec/views/playlists/new.html.haml_spec.rb b/spec/views/playlists/new.html.haml_spec.rb index 7f64b0d..d18fb37 100644 --- a/spec/views/playlists/new.html.haml_spec.rb +++ b/spec/views/playlists/new.html.haml_spec.rb @@ -1,20 +1,15 @@ require 'spec_helper' describe 'playlists/new' do - let(:playlist) do - mock_model(Playlist).as_new_record.as_null_object - end + let(:playlist) { mock_model(Playlist).as_new_record.as_null_object } - before do - assign :playlist, playlist - end + before { assign :playlist, playlist } it 'renders a form to create a playlist' do render expect(rendered) .to have_selector "form[method=post][action='#{playlists_path}']" - expect(rendered) - .to have_selector 'input[type=submit]' + expect(rendered).to have_selector 'input[type=submit]' end it 'renders a text field with a label for the playlists name' do @@ -22,7 +17,6 @@ describe 'playlists/new' do render expect(rendered) .to have_selector "input[type=text][name='playlist[name]'][value=Electro]" - expect(rendered) - .to have_selector 'label[for=playlist_name]', text: 'Name' + expect(rendered).to have_selector 'label[for=playlist_name]', text: 'Name' end end diff --git a/spec/views/tracks/new.html.haml_spec.rb b/spec/views/tracks/new.html.haml_spec.rb index 30bbddc..117d893 100644 --- a/spec/views/tracks/new.html.haml_spec.rb +++ b/spec/views/tracks/new.html.haml_spec.rb @@ -1,13 +1,9 @@ require 'spec_helper' describe 'tracks/new' do - let(:track) do - mock_model(Track).as_new_record.as_null_object - end + let(:track) { mock_model(Track).as_new_record.as_null_object } - before do - assign :track, track - end + before { assign :track, track } it 'renders a form to create a track' do render @@ -21,8 +17,7 @@ describe 'tracks/new' do render expect(rendered) .to have_selector "input[type=text][name='track[name]'][value='Mega song']" - expect(rendered) - .to have_selector('label[for=track_name]', text: 'Name') + expect(rendered).to have_selector('label[for=track_name]', text: 'Name') end it 'renders a file field with a label for the tracks file' do diff --git a/spec/views/tracks/show.html.haml_spec.rb b/spec/views/tracks/show.html.haml_spec.rb index accab67..7e4b9fb 100644 --- a/spec/views/tracks/show.html.haml_spec.rb +++ b/spec/views/tracks/show.html.haml_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'tracks/show' do let(:track) { FactoryGirl.create(:track) } - before do - assign :track, track - end + before { assign :track, track } it 'displays the name of the track' do render diff --git a/spec/views/users/new.html.haml_spec.rb b/spec/views/users/new.html.haml_spec.rb index 9772919..9ad8cc3 100644 --- a/spec/views/users/new.html.haml_spec.rb +++ b/spec/views/users/new.html.haml_spec.rb @@ -1,13 +1,9 @@ require 'spec_helper' describe 'users/new' do - let(:user) do - mock_model(User).as_new_record.as_null_object - end + let(:user) { mock_model(User).as_new_record.as_null_object } - before do - assign :user, user - end + before { assign :user, user } it 'renders a form to sign up' do render @@ -19,8 +15,7 @@ describe 'users/new' do it 'renders a text field with a label for the mail address' do render expect(rendered).to have_selector "input[type=text][name='user[email]']" - expect(rendered) - .to have_selector 'label[for=user_email]', text: 'Email' + expect(rendered).to have_selector 'label[for=user_email]', text: 'Email' end it 'renders a password field with a label for the password' do