ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-27 13:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return null steam data for previously invalid SteamIDs

Browse source
This commit is contained in:
Prommah 2015-09-24 03:16:35 +01:00
parent 3948541f10
commit ff1061272c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/users_controller.rb Normal file → Executable file
View file

@ -14,7 +14,7 @@ class Api::V1::UsersController < Api::V1::BaseController
time_zone: @user.time_zone, time_zone: @user.time_zone,
avatar: @user.profile.avatar.url, avatar: @user.profile.avatar.url,
admin: @user.admin?, admin: @user.admin?,
steam: { steam: @user.steamid.nil? ? nil : {
id: @user.steamid, id: @user.steamid,
url: @steam.nil? ? nil : @steam.base_url, url: @steam.nil? ? nil : @steam.base_url,
nickname: @steam.nil? ? nil : @steam.nickname nickname: @steam.nil? ? nil : @steam.nickname

8
spec/controllers/api/v1/users_controller_spec.rb Normal file → Executable file
View file

@ -29,16 +29,14 @@ describe Api::V1::UsersController do
expect(json["team"]).to be_nil expect(json["team"]).to be_nil
end end
it "returns data for users with invalid steam ids" do it "returns nulled steam data for users who had invalid steam ids" do
@user.steamid = "0:0:000" @user.steamid = nil
@user.save! @user.save!
get :show, id: @user.id get :show, id: @user.id
expect(response).to be_success expect(response).to be_success
expect(json["steam"]["id"]).to_not be_nil expect(json["steam"]).to be_nil
expect(json["steam"]["url"]).to be_nil
expect(json["steam"]["nickname"]).to be_nil
end end
it "returns 404 if user does not exist" do it "returns 404 if user does not exist" do