introspective_grape 0.3.5 → 0.4.1

data/spec/requests/chat_api_spec.rb

@@ -31,7 +31,7 @@ describe Dummy::ChatAPI, type: :request do
 
     it "should return a list of a user's chats" do
       get "/api/v1/chats"
-      response.should be_success
+      response.should be_successful
       json.size.should == 2
       json.first['creator_id'].to_i.should == @sender.id
       json.first['users'].size.should == Chat.find(json.first['id']).users.size
@@ -40,20 +40,20 @@ describe Dummy::ChatAPI, type: :request do
     context :notifications do
       it "should get new chat notifications" do
         get "/api/v1/chats/notifications/"
-        response.should be_success
+        response.should be_successful
         json.keys.size.should     == 1
         json[@pm.id.to_s].should   == 3
       end
 
       it "should get new chat notifications for a particular chat" do
-        get "/api/v1/chats/notifications/", id: @pm.id
-        response.should be_success
+        get "/api/v1/chats/notifications/", params: { id: @pm.id }
+        response.should be_successful
         json[@pm.id.to_s].should == 3
       end
 
       it "should return 0 for non-existent chats" do
-        get "/api/v1/chats/notifications/", id: 0
-        response.should be_success
+        get "/api/v1/chats/notifications/", params: { id: 0 }
+        response.should be_successful
         json['0'].should == 0
       end
     end
@@ -61,23 +61,23 @@ describe Dummy::ChatAPI, type: :request do
     context :messages do
 
       it "should get no new chat messages if user was last to reply" do
-        get "/api/v1/chats/messages", id: @chat.id, new: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { id: @chat.id, new: true }
+        response.should be_successful
         json.size.should == 0
       end
 
       it "should get new chat messages if user recieves another reply" do
         @sender.reply(@chat, "And now for something completely different.")
-        get "/api/v1/chats/messages", id: @chat.id, new: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { id: @chat.id, new: true }
+        response.should be_successful
         json.size.should == 1
       end
 
       it "should mark all new messages from all chats as read if mark_as_read is true" do
         @sender.reply(@chat, 'A new response.')
         @current_user.new_messages?.keys.size.should == 2
-        get "/api/v1/chats/messages", new: true, mark_as_read: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { new: true, mark_as_read: true }
+        response.should be_successful
         json.size.should == 4
         @current_user.new_messages?.keys.size.should == 0
       end
@@ -86,8 +86,8 @@ describe Dummy::ChatAPI, type: :request do
 
     context :users do
       it "should list the users in a chat" do
-        get "/api/v1/chats/users", id: @chat.id
-        response.should be_success
+        get "/api/v1/chats/users", params: { id: @chat.id }
+        response.should be_successful
         json.size.should == 3
         json.map{|u| u['email']}.sort.should == [ "current_user@springshot.com", "lurker@springshot.com", "sender@springshot.com" ]
       end
@@ -95,8 +95,8 @@ describe Dummy::ChatAPI, type: :request do
       it "should add a new user to a chat" do
         new_user1 = User.make
         new_user1.save!
-        post "/api/v1/chats/users", id: @chat.id, user_ids: new_user1.id
-        response.should be_success
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: new_user1.id }
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(new_user1).should == true
@@ -107,8 +107,8 @@ describe Dummy::ChatAPI, type: :request do
         new_user2 = User.make
         new_user1.save!
         new_user2.save!
-        post "/api/v1/chats/users", id: @chat.id, user_ids: "#{new_user1.id},#{new_user2.id}"
-        response.should be_success
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: "#{new_user1.id},#{new_user2.id}" }
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(new_user1).should == true
@@ -117,7 +117,7 @@ describe Dummy::ChatAPI, type: :request do
 
       it "should be invalid to add an already active chat member to a chat" do
         @chat.chat_users.size.should == 3
-        post "/api/v1/chats/users", id: @chat.id, user_ids: @chat.active_users.first.id
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: @chat.active_users.first.id }
         response.status.should == 400
         json['error'].should == "#{@chat.active_users.first.name} is already present in this chat."
         @chat.reload
@@ -125,7 +125,7 @@ describe Dummy::ChatAPI, type: :request do
       end
 
       it "should raise an error when an outsider tries to add themselves to a chat" do
-        post "/api/v1/chats/users", id: @lurk.id, user_ids: @current_user.id
+        post "/api/v1/chats/users", params: { id: @lurk.id, user_ids: @current_user.id }
         response.status.should == 400
         json['error'].should == 'Only current chat participants can add users.'
         @lurk.reload
@@ -136,8 +136,8 @@ describe Dummy::ChatAPI, type: :request do
 
     context :chat do
       it "should start a new chat" do
-        post "/api/v1/chats", user_ids:@lurker.id, message: 'a new chat'
-        response.should be_success
+        post "/api/v1/chats", params: { user_ids:@lurker.id, message: 'a new chat' }
+        response.should be_successful
         json['creator_id'].should == @current_user.id
         Chat.last.creator.should == @current_user
         Chat.last.messages.map(&:message).first.should == 'a new chat'
@@ -145,8 +145,8 @@ describe Dummy::ChatAPI, type: :request do
       end
 
       it "should reply to a chat" do
-        put "/api/v1/chats/#{@chat.id}", message: 'A reply.'
-        response.should be_success
+        put "/api/v1/chats/#{@chat.id}", params: { message: 'A reply.' }
+        response.should be_successful
         ChatMessage.last.author.should == @current_user
         @sender.read_messages(Chat.last.id ).last.message.should == 'A reply.'
         @lurker.read_messages(Chat.last.id ).last.message.should == 'A reply.'
@@ -154,7 +154,7 @@ describe Dummy::ChatAPI, type: :request do
 
       it "should leave a chat" do
         delete "/api/v1/chats/#{@chat.id}"
-        response.should be_success
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(@current_user).should == false
@@ -163,7 +163,7 @@ describe Dummy::ChatAPI, type: :request do
       it "should only allow chat participants to reply" do
         @current_user.leave_chat(@chat)
         @current_user.reload
-        put "/api/v1/chats/#{@chat.id}", message: "I'm an interloper"
+        put "/api/v1/chats/#{@chat.id}", params: { message: "I'm an interloper" }
         response.status.should == 400
         json['error'].should == 'Messages: is invalid'
         @chat.messages.last.should_not == "I'm an interloper"

data/spec/requests/company_api_spec.rb

@@ -4,13 +4,13 @@ describe Dummy::CompanyAPI, type: :request do
   context :default_values do
     it "should respect default values" do
       get '/api/v1/companies/special/list'
-      response.should be_success
+      response.should be_successful
       json.should eq({"boolean_default"=>false, "string_default"=>"foo", "integer_default"=>123})
     end
 
     it "should override default values" do
-      get '/api/v1/companies/special/list', boolean_default: true, string_default: 'bar', integer_default: 321
-      response.should be_success
+      get '/api/v1/companies/special/list', params: { boolean_default: true, string_default: 'bar', integer_default: 321 }
+      response.should be_successful
       json.should eq({"boolean_default"=>true, "string_default"=>"bar", "integer_default"=>321})
     end
   end
@@ -22,7 +22,7 @@ describe Dummy::CompanyAPI, type: :request do
 
       get '/api/v1/companies'
 
-      response.should be_success
+      response.should be_successful
       json.length.should eq 25
       json.first['id'].should eq Company.first.id
       response.headers.slice("X-Total", "X-Total-Pages", "X-Per-Page", "X-Page", "X-Next-Page", "X-Prev-Page", "X-Offset").values.should eq ["30", "2", "25", "1", "2", "", "0"]
@@ -37,14 +37,14 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should return a list of companies" do
     get '/api/v1/companies'
-    response.should be_success
+    response.should be_successful
     json.length.should > 0
     json.map{|c| c['id'].to_i}.include?(company.id).should == true
   end
 
   it "should return the specified company" do
     get "/api/v1/companies/#{company.id}"
-    response.should be_success
+    response.should be_successful
     json['name'].should == company.name
   end
 
@@ -55,14 +55,14 @@ describe Dummy::CompanyAPI, type: :request do
 
 
   it "should create a company" do
-    post "/api/v1/companies", { name: 'Test 123', short_name: 'T123' }
-    response.should be_success
+    post "/api/v1/companies", params: { name: 'Test 123', short_name: 'T123' }
+    response.should be_successful
     json['name'].should       == "Test 123"
     json['short_name'].should == "T123"
   end
 
   it "should validate a new company" do
-    post "/api/v1/companies", { name: 'a'*257, short_name: 'a'*11 }
+    post "/api/v1/companies", params: { name: 'a'*257, short_name: 'a'*11 }
     response.code.should == "400"
     json['error'].should == "Name: is too long (maximum is 256 characters), Short Name: is too long (maximum is 10 characters)"
   end
@@ -70,8 +70,8 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should update the company" do
     new_name = 'New Test 1234'
-    put "/api/v1/companies/#{company.id}", { name: new_name }
-    response.should be_success
+    put "/api/v1/companies/#{company.id}", params: { name: new_name }
+    response.should be_successful
     company.reload
     company.name.should == new_name
     json['name'].should == new_name
@@ -79,7 +79,7 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should validate the company on update" do
     old_name = company.name
-    put "/api/v1/companies/#{company.id}", { name: 'a'*257, short_name: 'a'*11 }
+    put "/api/v1/companies/#{company.id}", params: { name: 'a'*257, short_name: 'a'*11 }
     response.code.should == "400"
     company.reload
     company.name.should == old_name
@@ -87,17 +87,17 @@ describe Dummy::CompanyAPI, type: :request do
   end
 
   it "should validate json parameters" do
-    put "/api/v1/companies/#{company.id}", { gizmos: "garbage" }
+    put "/api/v1/companies/#{company.id}", params: { gizmos: "garbage" }
     json["error"].should eq "gizmos must be valid JSON!"
   end
 
   it "should validate json array parameters" do
-    put "/api/v1/companies/#{company.id}", { widgets: "[garbage[\"A\",\"B\"]" }
+    put "/api/v1/companies/#{company.id}", params: { widgets: "[garbage[\"A\",\"B\"]" }
     json["error"].should eq "widgets must be a valid JSON array!"
   end
 
   it "should validate json hash parameters" do
-    put "/api/v1/companies/#{company.id}", { sprockets: "{\"foo\":\"bar\"}garbage}" }
+    put "/api/v1/companies/#{company.id}", params: { sprockets: "{\"foo\":\"bar\"}garbage}" }
     json["error"].should eq "sprockets must be a valid JSON hash!"
   end
 

data/spec/requests/location_api_spec.rb

@@ -13,7 +13,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return an array of camelized location entities" do
     get '/api/v1/locations'
-    response.should be_success
+    response.should be_successful
     j = JSON.parse(response.body)
     j.each {|l| l.key?('childLocations').should be_truthy }
     j.each {|l| l.key?('parentLocationId').should be_truthy }
@@ -23,7 +23,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return a list of top level locations and their children" do
     get '/api/v1/locations'
-    response.should be_success
+    response.should be_successful
     json.length.should eq 2
     json.map{|l| l['id'].to_i }.include?(location.id).should == true
 
@@ -33,15 +33,15 @@ describe Dummy::LocationAPI, type: :request do
 
 
   it "should generate basic filters on the whitelisted model attributes" do
-    get '/api/v1/locations', { name: "TEST" }
-    response.should be_success
+    get '/api/v1/locations', params: { name: "TEST" }
+    response.should be_successful
     json.length.should eq 1
     json.first['name'].should eq "TEST"
   end
 
   it "should parse more advanced JSON filters" do
-    get '/api/v1/locations', filter: "{\"child_locations_locations\":{\"name\":\"Terminal A\"}}"
-    response.should be_success
+    get '/api/v1/locations', params: { filter: "{\"child_locations_locations\":{\"name\":\"Terminal A\"}}" }
+    response.should be_successful
     json.length.should eq 1
     json.first['child_locations'].length.should eq 1
     json.first['child_locations'].first['name'].should eq "Terminal A"
@@ -49,7 +49,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return the specified location" do
     get "/api/v1/locations/#{location.id}"
-    response.should be_success
+    response.should be_successful
     json['name'].should == location.name
   end
 
@@ -59,15 +59,15 @@ describe Dummy::LocationAPI, type: :request do
   end
 
   it "should create a location" do
-    post "/api/v1/locations", { name: 'Test 123', kind: "terminal" }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "terminal" }
+    response.should be_successful
     json['name'].should == "Test 123"
   end
 
   it "should create a location with a beacon" do
     b = LocationBeacon.make(company: Company.last)
-    post "/api/v1/locations", { name: 'Test 123', kind: "gate", beacons_attributes: [ b.attributes ] }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "gate", beacons_attributes: [ b.attributes ] }
+    response.should be_successful
     json['name'].should == "Test 123"
     l   = Location.find(json['id'])
     created = l.beacons.first
@@ -78,8 +78,8 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should create a location with gps coordinates" do
     gps = LocationGps.make
-    post "/api/v1/locations", { name: 'Test 123', kind: "airport", gps_attributes: gps.attributes }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "airport", gps_attributes: gps.attributes }
+    response.should be_successful
     json['name'].should == "Test 123"
     l   = Location.find(json['id'])
     created = l.gps
@@ -90,15 +90,15 @@ describe Dummy::LocationAPI, type: :request do
   end
 
   it "should validate a new location" do
-    post "/api/v1/locations", { name: 'test' }
+    post "/api/v1/locations", params: { name: 'test' }
     response.code.should == "400"
     json['error'].should == "Kind: is not included in the list"
   end
 
   it "should update the location" do
     new_name = 'New Test 1234'
-    put "/api/v1/locations/#{location.id}", { name: new_name }
-    response.should be_success
+    put "/api/v1/locations/#{location.id}", params: { name: new_name }
+    response.should be_successful
     location.reload
     location.name.should == new_name
     json['name'].should == new_name
@@ -106,7 +106,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should validate the location on update" do
     old_kind = location.kind
-    put "/api/v1/locations/#{location.id}", { kind: 'bring the noise' }
+    put "/api/v1/locations/#{location.id}", params: { kind: 'bring the noise' }
     response.code.should == "400"
     location.reload
     location.kind.should == old_kind
@@ -116,7 +116,7 @@ describe Dummy::LocationAPI, type: :request do
   it "should destroy the location and all of its child and grandchild locations" do
     child_locations = location.child_locations.map {|l| [l.id, l.child_locations.map(&:id)] }.flatten
     delete "/api/v1/locations/#{location.id}"
-    response.should be_success
+    response.should be_successful
     Location.find_by_id(location.id).should == nil
     Location.where(id: child_locations).size.should == 0
   end

data/spec/requests/project_api_spec.rb

@@ -24,15 +24,15 @@ describe Dummy::ProjectAPI, type: :request do
 
   context "As a super admin" do
     it "should return a list of all projects" do
-      get '/api/v1/projects', per_page: 10, offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { per_page: 10, offset: 0 }
+      response.should be_successful
       json.length.should == Project.count
       json.map{|c| c['id'].to_i}.include?(project.id).should == true
     end
 
     it "should return the specified project" do
       get "/api/v1/projects/#{project.id}"
-      response.should be_success
+      response.should be_successful
       json['name'].should == project.name
     end
 
@@ -56,8 +56,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = {
             name: 'New Team', team_users_attributes: [{ user_id: @u1.id }, { user_id: @u2.id }]
           }
-          post "/api/v1/projects/#{project.id}/teams", p
-          response.should be_success
+          post "/api/v1/projects/#{project.id}/teams", params: p
+          response.should be_successful
           Team.last.name.should == 'New Team'
           Team.last.users.to_a.should == [@u1,@u2]
         end
@@ -66,8 +66,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = { team_users_attributes: [
             { user_id: @u1.id }, { user_id: @u2.id }
           ] }
-          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", p
-          response.should be_success
+          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", params: p
+          response.should be_successful
 
           Team.last.users.to_a.should == [@u1,@u2]
         end
@@ -78,8 +78,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = { team_users_attributes: [
             { id: @team.team_users.where(user_id:@u1.id).first.id, _destroy: 1 }
           ] }
-          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", p
-          response.should be_success
+          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", params: p
+          response.should be_successful
           Team.last.users.to_a.should == [@u2]
         end
       end
@@ -87,8 +87,8 @@ describe Dummy::ProjectAPI, type: :request do
       context "edit a project team via nested routes" do
         it "should add a team member" do
           p = { user_id: @u1.id }
-          post "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users", p
-          response.should be_success
+          post "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users", params: p
+          response.should be_successful
           Team.last.users.to_a.should == [@u1]
         end
 
@@ -97,7 +97,7 @@ describe Dummy::ProjectAPI, type: :request do
           @team.save!
           id = @team.team_users.where(user_id:@u1.id).first.id
           delete "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users/#{id}"
-          response.should be_success
+          response.should be_successful
           Team.last.users.to_a.should == [@u2]
         end
       end
@@ -118,8 +118,8 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return a list of all the company's projects" do
-      get '/api/v1/projects', offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { offset: 0 }
+      response.should be_successful
       json.length.should == 2
       json.map{|c| c['name']}.include?("Manufacture Sprockets").should == true
       json.map{|c| c['name']}.include?("Disassemble Sprockets").should == true
@@ -140,8 +140,8 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return a list of all the project admin's projects" do
-      get '/api/v1/projects', offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { offset: 0 }
+      response.should be_successful
       json.length.should == 1
       json.map{|c| c['name']}.include?("Manufacture Sprockets").should == true
       json.map{|c| c['name']}.include?("Disassemble Sprockets").should == false
@@ -156,7 +156,7 @@ describe Dummy::ProjectAPI, type: :request do
 
     it "should return the project API's declared default paginated results" do
       get '/api/v1/projects'
-      response.should be_success
+      response.should be_successful
       json.length.should == 2
       json.first['id'].should eq Project.all[2].id
       json.second['id'].should eq Project.all[3].id
@@ -164,17 +164,17 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return the request number of results" do
-      get '/api/v1/projects', per_page: 9, offset: 9
-      response.should be_success
+      get '/api/v1/projects', params: { per_page: 9, offset: 9 }
+      response.should be_successful
       json.size.should == 9
       json.map {|j| j['id']}.should eq Project.all[9..17].map(&:id)
       response.headers.slice("X-Total", "X-Total-Pages", "X-Per-Page", "X-Page", "X-Next-Page", "X-Prev-Page", "X-Offset").values.should eq ["20", "2", "9", "1", "2", "", "9"]
     end
 
     it "should respect the maximum number of results" do
-      get '/api/v1/projects', per_page: 20, offset: 0
+      get '/api/v1/projects', params: { per_page: 20, offset: 0 }
       response.code.should eq "400"
-      json['error'].should eq "per_page must be less than 10"
+      json['error'].should eq "per_page must be less than or equal 10"
     end
   end