Fix failing test suite

spec/factories/user_factory.rb

@@ -16,14 +16,5 @@
         user.decode_image_data
       end
     end
-
-    trait :with_s3_photo do
-      after(:build) do |user, evaluator|
-        user.photo_file_name = 'user.jpg'
-        user.photo_content_type = 'image/jpeg'
-        user.photo_file_size = 1024
-        user.photo_updated_at = Time.now
-      end
-    end
   end
 end

spec/models/user_spec.rb

@@ -51,30 +51,6 @@
           .allowing('image/png', 'image/gif')
           .rejecting('text/plain', 'text/xml') }
     end
-
-    context 'with cloudfront' do
-      before do
-        @user = create(:user, :with_s3_photo)
-      end
-
-      it 'should have cloudfront in the URL' do
-        expect(@user.photo.url(:thumb)).to include 'cloudfront'
-      end
-
-      it 'should have the right path' do
-        expect(@user.photo.url(:thumb)).to include "users/#{@user.id}/thumb"
-      end
-
-      it 'should change the full url when the photo gets modified' do
-        old_url = @user.photo.url
-        allow(Time).to receive(:now).and_return(Time.now + 1.second)
-        # this simulates a reprocessing of the photo, while skiping the actual request
-        @user.photo.send(:assign_timestamps)
-        @user.photo.send(:save)
-        new_url = @user.photo.url
-        expect(new_url).not_to eq old_url
-      end
-    end
   end
 
   context 'following behavior' do

spec/requests/api/users_spec.rb

@@ -520,8 +520,6 @@
         @user.reload
         expect(@user.base_64_photo_data).to be_nil
         expect(@user.photo.path).to_not be_nil
-        expect(@user.photo.url(:original)).to include "cloudfront"
-        expect(@user.photo.url(:original)).to include "users/#{@user.id}/original"
       end
     end