From f7451eb7bdd3729390d07eac2b3723d842583f65 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Thu, 15 Sep 2016 16:52:28 -0500 Subject: [PATCH] Add webcam_url to serializer, update tests --- app/serializers/device_serializer.rb | 2 +- spec/controllers/api/tokens/users_controller_create_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/serializers/device_serializer.rb b/app/serializers/device_serializer.rb index aadc8fe8b..6ecb382bf 100644 --- a/app/serializers/device_serializer.rb +++ b/app/serializers/device_serializer.rb @@ -1,3 +1,3 @@ class DeviceSerializer < ActiveModel::Serializer - attributes :id, :name, :uuid + attributes :id, :name, :uuid, :webcam_url end diff --git a/spec/controllers/api/tokens/users_controller_create_spec.rb b/spec/controllers/api/tokens/users_controller_create_spec.rb index 1d18f0ab3..3a402c8d3 100644 --- a/spec/controllers/api/tokens/users_controller_create_spec.rb +++ b/spec/controllers/api/tokens/users_controller_create_spec.rb @@ -10,7 +10,8 @@ describe Api::TokensController do payload = {user: {email: user.email, password: "password"}} post :create, payload token = json[:token][:unencoded] - expect(token[:iss]).to eq("http://test.host/") + expect(token[:iss].last).not_to eq("/") # Trailing slashes are BAD! + expect(token[:iss]).to eq("http://localhost:3000") end end end