diff options
| -rw-r--r-- | app/views/v1/licenses/index.jbuilder | 14 | ||||
| -rw-r--r-- | app/views/v1/shared/_license_statuses.json.jbuilder | 5 | ||||
| -rw-r--r-- | app/views/v1/shared/_well_types.json.jbuilder | 7 | ||||
| -rw-r--r-- | spec/views/v1/licenses/index.json.jbuilder_spec.rb | 1 |
4 files changed, 14 insertions, 13 deletions
diff --git a/app/views/v1/licenses/index.jbuilder b/app/views/v1/licenses/index.jbuilder index f8125e5..8228f3e 100644 --- a/app/views/v1/licenses/index.jbuilder +++ b/app/views/v1/licenses/index.jbuilder @@ -3,15 +3,5 @@ json.licenses do json.partial! 'v1/licenses/license', license: license end end -json.well_types do - json.array! @well_types do |well_type| - json.id well_type.id - json.acronym well_type.acronym - json.name well_type.name - end -end -json.license_statuses do - json.array! @license_statuses do |status| - json.name status.to_s - end -end +json.partial! 'v1/shared/well_types', well_types: @well_types +json.partial! 'v1/shared/license_statuses', license_statuses: @license_statuses diff --git a/app/views/v1/shared/_license_statuses.json.jbuilder b/app/views/v1/shared/_license_statuses.json.jbuilder new file mode 100644 index 0000000..76c2ec6 --- /dev/null +++ b/app/views/v1/shared/_license_statuses.json.jbuilder @@ -0,0 +1,5 @@ +json.license_statuses do + json.array! license_statuses do |status| + json.name status.to_s + end +end diff --git a/app/views/v1/shared/_well_types.json.jbuilder b/app/views/v1/shared/_well_types.json.jbuilder new file mode 100644 index 0000000..e1b588d --- /dev/null +++ b/app/views/v1/shared/_well_types.json.jbuilder @@ -0,0 +1,7 @@ +json.well_types do + json.array! well_types do |well_type| + json.id well_type.id + json.acronym well_type.acronym + json.name well_type.name + end +end diff --git a/spec/views/v1/licenses/index.json.jbuilder_spec.rb b/spec/views/v1/licenses/index.json.jbuilder_spec.rb index 297f2af..6a17700 100644 --- a/spec/views/v1/licenses/index.json.jbuilder_spec.rb +++ b/spec/views/v1/licenses/index.json.jbuilder_spec.rb @@ -50,7 +50,6 @@ describe 'v1/licenses/index' do end it "includes all the license statuses" do - puts rendered LicenseStatus::ALL.each do |status| row = result["license_statuses"].find { |x| x['name'] == status.to_s } row.should_not be_nil |