Use one-liners in specs where possible

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

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

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

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

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

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

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) }

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

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')

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')

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')

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

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')

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

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

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

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

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

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

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

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

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