Merge branch 'fix_user_value_bug'

Vasiliy Ermolovich
2 parents 6390f13e 8b5159ec
Showing 2 changed files with 19 additions and 1 deletions Show diff stats
app/views/notices/_user_attributes.html.haml
spec/views/notices/_user_attributes.html.haml_spec.rb
@@ -6,4 +6,4 @@
     - user.each do |user_key, user_value|
       %tr
         %th= user_key
-        %td= auto_link(user_value).html_safe
+        %td= auto_link(user_value.to_s).html_safe
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "notices/_user_attributes.html.haml" do
+  describe 'autolink' do
+    let(:notice) do
+      user_attributes = { 'foo' => {'bar' => 'http://example.com'} }
+      Fabricate(:notice, :user_attributes => user_attributes)
+    end
+
+    it "renders table with user attributes" do
+      assign :app, notice.err.app
+
+      render "notices/user_attributes", :user => notice.user_attributes
+      rendered.should have_link('http://example.com')
+    end
+  end
+end
+
	@@ -6,4 +6,4 @@		@@ -6,4 +6,4 @@
6	- user.each do \|user_key, user_value\|	6	- user.each do \|user_key, user_value\|
7	%tr	7	%tr
8	%th= user_key	8	%th= user_key
9	- %td= auto_link(user_value).html_safe	9	+ %td= auto_link(user_value.to_s).html_safe
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "notices/_user_attributes.html.haml" do
	4	+ describe 'autolink' do
	5	+ let(:notice) do
	6	+ user_attributes = { 'foo' => {'bar' => 'http://example.com'} }
	7	+ Fabricate(:notice, :user_attributes => user_attributes)
	8	+ end
	9	+
	10	+ it "renders table with user attributes" do
	11	+ assign :app, notice.err.app
	12	+
	13	+ render "notices/user_attributes", :user => notice.user_attributes
	14	+ rendered.should have_link('http://example.com')
	15	+ end
	16	+ end
	17	+end
	18	+