diff options
| -rw-r--r-- | app/views/v1/licenses/index.jbuilder | 1 | ||||
| -rw-r--r-- | spec/views/v1/licenses/index.json.jbuilder_spec.rb | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/views/v1/licenses/index.jbuilder b/app/views/v1/licenses/index.jbuilder index 5eaf41e..b6afb2d 100644 --- a/app/views/v1/licenses/index.jbuilder +++ b/app/views/v1/licenses/index.jbuilder @@ -1,4 +1,5 @@ json.array! @licenses do |license| + json.id license.id json.well_type do json.id license.well_type.id json.acronym license.well_type.acronym diff --git a/spec/views/v1/licenses/index.json.jbuilder_spec.rb b/spec/views/v1/licenses/index.json.jbuilder_spec.rb index 38d9955..412f6fb 100644 --- a/spec/views/v1/licenses/index.json.jbuilder_spec.rb +++ b/spec/views/v1/licenses/index.json.jbuilder_spec.rb @@ -5,24 +5,26 @@ describe 'v1/licenses/index' do let(:user) { User.new(company: company) } let(:location) { Location.new(latitude: 51.06, longitude: -114.09, township: '1') } let(:well_type) { WellType::DEV } - let!(:license) { License.new(company: company, applicant: user, location: location, issued_at: 2.days.ago, expired_at: 1.day.from_now, well_type: well_type) } + let!(:license) { License.new(id: SecureRandom.uuid, company: company, applicant: user, location: location, issued_at: 2.days.ago, expired_at: 1.day.from_now, well_type: well_type) } before :each do assign(:licenses, [license]) render + puts rendered end let(:result) { JSON.parse(rendered) } it "includes the license date range" do - result.first["issued_at"].should == license.issued_at.to_s - result.first["expired_at"].should == license.expired_at.to_s + result.first["id"].should == license.id + result.first["company"]["name"].should == license.company.name result.first["well_type"]["id"].should == well_type.id result.first["well_type"]["acronym"].should == well_type.acronym result.first["well_type"]["name"].should == well_type.name result.first["location"]["latitude"].should == location.latitude result.first["location"]["longitude"].should == location.longitude result.first["location"]["township"].should == location.township - result.first["company"]["name"].should == license.company.name + result.first["issued_at"].should == license.issued_at.to_s + result.first["expired_at"].should == license.expired_at.to_s end end |