From fae21e87d433e04470e26e77795fe2b8e32646ef Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Wed, 29 Apr 2015 13:06:44 +0000
Subject: [PATCH] Fix rspec 2.99 deprecations

---
 spec/controllers/api/playlists_controller_spec.rb |  2 +-
 spec/controllers/api/tracks_controller_spec.rb    |  2 +-
 spec/models/user_spec.rb                          | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/api/playlists_controller_spec.rb b/spec/controllers/api/playlists_controller_spec.rb
index 05b75e1..84599e7 100644
--- a/spec/controllers/api/playlists_controller_spec.rb
+++ b/spec/controllers/api/playlists_controller_spec.rb
@@ -19,7 +19,7 @@ describe API::PlaylistsController do
     end
 
     it 'lists all playlists' do
-      expect(do_get).to have(2).items
+      expect(do_get.size).to eq 2
     end
 
     it 'lists playlists with their id' do
diff --git a/spec/controllers/api/tracks_controller_spec.rb b/spec/controllers/api/tracks_controller_spec.rb
index b31008a..7aa8059 100644
--- a/spec/controllers/api/tracks_controller_spec.rb
+++ b/spec/controllers/api/tracks_controller_spec.rb
@@ -19,7 +19,7 @@ describe API::TracksController do
     end
 
     it 'lists all tracks' do
-      expect(do_get).to have(2).items
+      expect(do_get.size).to eq 2
     end
 
     it 'lists tracks with their id' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e9381ee..a8d21fd 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe User do
-  subject     { user }
-  let(:user)  { FactoryGirl.build(:user) }
+  subject(:user) { FactoryGirl.build(:user) }
 
   it { should be_valid }
   it { should have_many :playlists }
@@ -12,11 +11,14 @@ describe User do
 
   context 'when a user with the same email address already exists' do
     let(:old_user)  { FactoryGirl.create(:user, email: 'unique@example.net') }
-    subject         { FactoryGirl.build(:user, email: old_user.email) }
+    subject(:user)  { FactoryGirl.build(:user, email: old_user.email) }
 
     it { should_not be_valid }
 
-    it { should have(1).error_on(:email) }
+    it 'has an error on email attribute' do
+      user.valid?
+      expect(user.errors[:email].size).to eq 1
+    end
   end
 
   context 'when password_confirmation does not match password' do