Use ruby 2.x hash syntax

This commit is contained in:
Thibault Jouan
2014-04-01 10:48:18 +00:00
parent 712e9501a2
commit da96c4814a
52 changed files with 148 additions and 148 deletions

View File

@@ -3,25 +3,25 @@ require 'spec_helper'
describe 'home/index' do
before do
assign :playlists, [
mock_model(Playlist, :name => 'Electro')
mock_model(Playlist, name: 'Electro')
]
assign :tracks, [
mock_model(Track, :name => 'Mega song')
mock_model(Track, name: 'Mega song')
]
end
it 'displays a list of playlists' do
render
rendered.should have_selector('ul>li', :text => 'Electro')
rendered.should have_selector('ul>li', text: 'Electro')
end
it 'displays a link to add a track' do
render
rendered.should have_selector('a', :text => 'Add a track')
rendered.should have_selector('a', text: 'Add a track')
end
it 'displays a list of tracks' do
render
rendered.should have_selector('ul>li', :text => 'Mega song')
rendered.should have_selector('ul>li', text: 'Mega song')
end
end

View File

@@ -16,11 +16,11 @@ describe 'playlists/edit' do
end
it 'renders a text field with a label for the playlists name' do
playlist.stub(:name => 'Electro')
playlist.stub(name: 'Electro')
render
rendered.should have_selector(
"input[type=text][name='playlist[name]'][value=Electro]"
)
rendered.should have_selector("label[for=playlist_name]", :text => 'Name')
rendered.should have_selector("label[for=playlist_name]", text: 'Name')
end
end

View File

@@ -3,22 +3,22 @@ require 'spec_helper'
describe 'playlists/index' do
before do
assign :playlists, [
mock_model(Playlist, :name => 'Electro')
mock_model(Playlist, name: 'Electro')
]
end
it 'displays a list of playlists' do
render
rendered.should have_selector('ul>li', :text => 'Electro')
rendered.should have_selector('ul>li', text: 'Electro')
end
it 'displays a link to create a new playlist' do
render
rendered.should have_selector('a', :text => 'Create playlist')
rendered.should have_selector('a', text: 'Create playlist')
end
it 'displays playlists as links' do
render
rendered.should have_selector('a', :text => 'Electro')
rendered.should have_selector('a', text: 'Electro')
end
end

View File

@@ -18,11 +18,11 @@ describe 'playlists/new' do
end
it 'renders a text field with a label for the playlists name' do
playlist.stub(:name => 'Electro')
playlist.stub(name: 'Electro')
render
rendered.should have_selector(
"input[type=text][name='playlist[name]'][value=Electro]"
)
rendered.should have_selector("label[for=playlist_name]", :text => 'Name')
rendered.should have_selector("label[for=playlist_name]", text: 'Name')
end
end

View File

@@ -12,7 +12,7 @@ describe 'sessions/new' do
it 'renders a text field with a label for the mail address' do
render
rendered.should have_selector("input[type=text][name='session[email]']")
rendered.should have_selector('label[for=session_email]', :text => 'Email')
rendered.should have_selector('label[for=session_email]', text: 'Email')
end
it 'renders a password field with a label for the password' do
@@ -21,7 +21,7 @@ describe 'sessions/new' do
"input[type=password][name='session[password]']"
)
rendered.should have_selector(
'label[for=session_password]', :text => 'Password'
'label[for=session_password]', text: 'Password'
)
end
@@ -29,7 +29,7 @@ describe 'sessions/new' do
render
rendered.should have_selector(
"a[href='#{new_user_path}']",
:text => 'Sign up'
text: 'Sign up'
)
end
end

View File

@@ -16,18 +16,18 @@ describe 'tracks/new' do
end
it 'renders a text field with a label for the playlists name' do
track.stub(:name => 'Mega song')
track.stub(name: 'Mega song')
render
rendered.should have_selector(
"input[type=text][name='track[name]'][value='Mega song']"
)
rendered.should have_selector('label[for=track_name]', :text => 'Name')
rendered.should have_selector('label[for=track_name]', text: 'Name')
end
it 'renders a file field with a label for the tracks file' do
render
rendered.should have_selector("form[enctype='multipart/form-data']")
rendered.should have_selector("input[type=file][name='track[file]']")
rendered.should have_selector('label[for=track_file]', :text => 'File')
rendered.should have_selector('label[for=track_file]', text: 'File')
end
end

View File

@@ -9,7 +9,7 @@ describe 'tracks/show' do
it 'displays the name of the track' do
render
rendered.should have_selector('h1', :text => 'Mega song')
rendered.should have_selector('h1', text: 'Mega song')
end
context 'when track has a sound' do
@@ -34,7 +34,7 @@ describe 'tracks/show' do
render
rendered.should have_selector(
'audio',
:text => 'Your browser does not support the audio element'
text: 'Your browser does not support the audio element'
)
end
end

View File

@@ -21,7 +21,7 @@ describe 'users/new' do
"input[type=text][name='user[email]']"
)
rendered.should have_selector(
'label[for=user_email]', :text => 'Email'
'label[for=user_email]', text: 'Email'
)
end
@@ -31,7 +31,7 @@ describe 'users/new' do
"input[type=password][name='user[password]']"
)
rendered.should have_selector(
'label[for=user_password]', :text => 'Password'
'label[for=user_password]', text: 'Password'
)
end
@@ -42,14 +42,14 @@ describe 'users/new' do
)
rendered.should have_selector(
'label[for=user_password_confirmation]',
:text => 'Password confirmation'
text: 'Password confirmation'
)
end
context 'when the user has some validation errors' do
it 'on the email address uniqueness' do
user = FactoryGirl.create(:user, :email => 'unique@example.net')
new_user = FactoryGirl.build(:user, :email => user.email)
user = FactoryGirl.create(:user, email: 'unique@example.net')
new_user = FactoryGirl.build(:user, email: user.email)
new_user.save
assign :user, new_user
render