Merge c4e0a5312e into be33f345a1

spec/factories/conferences.rb

@@ -2,7 +2,7 @@
 
 FactoryGirl.define do
   factory :conference do
-    title { Faker::Book.title }
+    title { CGI.escapeHTML(Faker::Book.title) }
     short_title { SecureRandom.urlsafe_base64(4) }
     timezone { Faker::Address.time_zone }
     start_date { Date.today }

spec/factories/events.rb

@@ -2,8 +2,8 @@
 
 FactoryGirl.define do
   factory :event do
-    title { Faker::Hipster.sentence }
-    abstract { Faker::Hipster.paragraph(2) }
+    title { CGI.escapeHTML(Faker::Hipster.sentence) }
+    abstract { CGI.escapeHTML(Faker::Hipster.paragraph(2)) }
 
     program
 

spec/factories/sponsors.rb

@@ -2,7 +2,7 @@
 
 FactoryGirl.define do
   factory :sponsor do
-    name { Faker::Company.name }
+    name { CGI.escapeHTML(Faker::Company.name) }
     website_url { Faker::Internet.url }
     description { Faker::Lorem.paragraph }
 

spec/factories/tickets.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :ticket do
-    title { "#{Faker::Hipster.word} Ticket" }
+    title { CGI.escapeHTML("#{Faker::Hipster.word} Ticket") }
     price_cents 1000
     price_currency 'USD'
   end

spec/factories/tracks.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :track do
-    name { Faker::Commerce.department(2, true) }
+    name { CGI.escapeHTML(Faker::Commerce.department(2, true)) }
     description { Faker::Lorem.sentence }
     color { Faker::Color.hex_color }
     program

spec/factories/venues.rb

@@ -1,7 +1,7 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 FactoryGirl.define do
   factory :venue do
-    name { "#{Faker::Company.name} Office" }
+    name { CGI.escapeHTML("#{Faker::Company.name} Office") }
     street { Faker::Address.street_address }
     city { Faker::Address.city }
     postalcode { Faker::Address.postcode }