summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-02-21 21:03:56 -0700
committermo khan <mo@mokhan.ca>2014-02-21 21:03:56 -0700
commit4f6de445141fc5542f61a1830c29ad61ecbeb49b (patch)
treed769b60454e95cdf63ff741dff4375bfb3a80d3e /spec
parentf6eebdeb6aa56c4734102caf1817479d9e7b2765 (diff)
load well statuses and well types in application controller.
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/application_controller_spec.rb19
-rw-r--r--spec/controllers/v1/company_licenses_controller_spec.rb10
2 files changed, 19 insertions, 10 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
new file mode 100644
index 0000000..a26c465
--- /dev/null
+++ b/spec/controllers/application_controller_spec.rb
@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe ApplicationController do
+ controller do
+ def index
+ render nothing: true
+ end
+ end
+
+ it "includes all well statuses with every response" do
+ get :index
+ assigns(:license_statuses).should =~ LicenseStatus::ALL
+ end
+
+ it "includes all well types with every response" do
+ get :index
+ assigns(:well_types).should =~ WellType::ALL
+ end
+end
diff --git a/spec/controllers/v1/company_licenses_controller_spec.rb b/spec/controllers/v1/company_licenses_controller_spec.rb
index c139f8b..2784a1d 100644
--- a/spec/controllers/v1/company_licenses_controller_spec.rb
+++ b/spec/controllers/v1/company_licenses_controller_spec.rb
@@ -27,15 +27,5 @@ describe V1::CompanyLicensesController do
xhr :get, :index, company_id: company_id, township: "123"
assigns(:active_licenses).should == active_licenses_in_township
end
-
- it "includes each well status" do
- xhr :get, :index, company_id: company_id
- assigns(:license_statuses).should =~ LicenseStatus::ALL
- end
-
- it "includes each well type" do
- xhr :get, :index, company_id: company_id
- assigns(:well_types).should =~ WellType::ALL
- end
end
end