Merge pull request #292 from ifad/chore/no-raise-rescue

Use respond instead of raise and rescue

lib/app.rb

@@ -205,7 +205,7 @@ class App < Sinatra::Base
              elsif params[:url]
                Net::HTTP.get URI(params[:url])
              else
-               raise Error.new 400, "Please specify either 'file' or 'url' POST variable"
+               return respond 400, "Please specify either 'file' or 'url' POST variable"
              end
       path = LegacyConverter.new.convert_file params[:action], body, params[:language]
       converted_url = @legacy_url_base + path

spec/lib/app_spec.rb

@@ -262,7 +262,7 @@ def show_backtrace(response)
         expect(last_response.status).to eq 400
         body = JSON.parse(last_response.body)
         expect(body).to be_a Hash
-        expect(body['description'].to_s).to eq "missing file parameter"
+        expect(body['description']).to eq "missing file parameter"
       end
     end
 
@@ -275,7 +275,7 @@ def show_backtrace(response)
         expect(last_response.status).to eq 400
         body = JSON.parse(last_response.body)
         expect(body).to be_a Hash
-        expect(body['description'].to_s).to eq "invalid file parameter"
+        expect(body['description']).to eq "invalid file parameter"
       end
     end
 
@@ -324,7 +324,7 @@ def show_backtrace(response)
       expect(last_response.content_type).to eq 'application/json'
       body = JSON.parse(last_response.body)
       expect(body).to be_a Hash
-      expect(body['converted'].to_s).not_to eq ''
+      expect(body['converted']).not_to eq ''
     end
 
     it 'converts and saves URL' do
@@ -341,7 +341,7 @@ def show_backtrace(response)
       expect(last_response.content_type).to eq 'application/json'
       body = JSON.parse(last_response.body)
       expect(body).to be_a Hash
-      expect(body['converted'].to_s).not_to eq ''
+      expect(body['converted']).not_to eq ''
     end
 
     it 'returns correct JSON structure on fail' do
@@ -367,7 +367,7 @@ def show_backtrace(response)
         expect(last_response.content_type).to eq 'application/json'
         body = JSON.parse(last_response.body)
         expect(body).to be_a Hash
-        expect(body['error']).to eq "Please specify either 'file' or 'url' POST variable"
+        expect(body['description']).to eq "Please specify either 'file' or 'url' POST variable"
       end
     end
   end
@@ -387,7 +387,7 @@ def show_backtrace(response)
       expect(last_response.content_type).to eq 'application/json'
       body = JSON.parse(last_response.body)
       expect(body).to be_a Hash
-      expect(body['error'].to_s).not_to eq ''
+      expect(body['error']).to eq 'File does not exists'
     end
   end
 end