fixes #910 force env_vars to always be a hash

Stephen Crosby
1 parent 24d0dec6
Showing 2 changed files with 16 additions and 1 deletions Show diff stats
app/models/notice.rb
spec/models/notice_spec.rb
@@ -94,7 +94,8 @@ class Notice
   end
   def env_vars
-    request['cgi-data'] || {}
+    vars = request['cgi-data']
+    vars.is_a?(Hash) ? vars : {}
   end
   def params
@@ -105,4 +105,18 @@ describe Notice, type: &#39;model&#39; do
       expect(notice.request).to eq ({})
     end
   end
+
+  describe "env_vars" do
+    it "returns the cgi-data" do
+      notice = Notice.new
+      notice.request = { 'cgi-data' => { 'ONE' => 'TWO' } }
+      expect(notice.env_vars).to eq({ 'ONE' => 'TWO' })
+    end
+
+    it "always returns a hash" do
+      notice = Notice.new
+      notice.request = { 'cgi-data' => [] }
+      expect(notice.env_vars).to eq({})
+    end
+  end
 end
	@@ -94,7 +94,8 @@ class Notice		@@ -94,7 +94,8 @@ class Notice
94	end	94	end
95		95
96	def env_vars	96	def env_vars
97	- request['cgi-data'] \|\| {}	97	+ vars = request['cgi-data']
		98	+ vars.is_a?(Hash) ? vars : {}
98	end	99	end
99		100
100	def params	101	def params
	@@ -105,4 +105,18 @@ describe Notice, type: 'model' do		@@ -105,4 +105,18 @@ describe Notice, type: 'model' do
105	expect(notice.request).to eq ({})	105	expect(notice.request).to eq ({})
106	end	106	end
107	end	107	end
		108	+
		109	+ describe "env_vars" do
		110	+ it "returns the cgi-data" do
		111	+ notice = Notice.new
		112	+ notice.request = { 'cgi-data' => { 'ONE' => 'TWO' } }
		113	+ expect(notice.env_vars).to eq({ 'ONE' => 'TWO' })
		114	+ end
		115	+
		116	+ it "always returns a hash" do
		117	+ notice = Notice.new
		118	+ notice.request = { 'cgi-data' => [] }
		119	+ expect(notice.env_vars).to eq({})
		120	+ end
		121	+ end
108	end	122	end