summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-02-22 08:00:50 -0700
committermo khan <mo@mokhan.ca>2014-02-22 08:00:50 -0700
commit86036fa0e99d77b34edf16349b1e681db660558f (patch)
tree107d8bb986c3ebfe90aa39f1a38cb89487369fa2 /spec
parentb675903ccb615c1f1868cd46095fec140a4198ae (diff)
add applicant name to json response.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/user_spec.rb6
-rw-r--r--spec/views/v1/licenses/show.json.jbuilder_spec.rb5
2 files changed, 9 insertions, 2 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 71d9e18..1117f00 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -16,4 +16,10 @@ describe User do
end
end
end
+
+ describe "#full_name" do
+ it "returns the full name" do
+ User.new(first_name: "mo", last_name: "khan").full_name.should == "mo khan"
+ end
+ end
end
diff --git a/spec/views/v1/licenses/show.json.jbuilder_spec.rb b/spec/views/v1/licenses/show.json.jbuilder_spec.rb
index 576c1bb..db8730f 100644
--- a/spec/views/v1/licenses/show.json.jbuilder_spec.rb
+++ b/spec/views/v1/licenses/show.json.jbuilder_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
describe 'v1/licenses/show' do
let(:company) { Company.new(name: 'ABC Resources Ltd.') }
- let(:user) { User.new(company: company) }
+ let(:user) { User.new(first_name: 'john', last_name: 'dielwart', company: company) }
let(:location) { Location.new(latitude: 51.06, longitude: -114.09, township: '1') }
let(:well_type) { WellType::DEV }
@@ -27,6 +27,7 @@ describe 'v1/licenses/show' do
it "includes the company information" do
result["company"]["name"].should == public_license.company.name
+ result["company"]["applicant_name"].should == user.full_name
end
it "includes information on the type of well" do
@@ -53,7 +54,7 @@ describe 'v1/licenses/show' do
let(:result) { JSON.parse(rendered) }
it "should hide the name of the applicant" do
-
+ result["company"]["applicant_name"].should == "CONFIDENTIAL"
end
it "should hide the type of well" do