Merge branch 'master' of https://github.com/bikebike/BikeBike

Conflicts:
	Gemfile
	Gemfile.lock

test/factories/event_types.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :event_type do
+    slug "MyString"
+    info "MyText"
+  end
+end

test/factories/events.rb

@@ -0,0 +1,14 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :event do
+    title "MyString"
+    slug "MyString"
+    event_type_id 1
+    conference ""
+    info "MyText"
+    location ""
+    start_time "2014-03-15 12:32:41"
+    end_time "2014-03-15 12:32:41"
+  end
+end

test/factories/workshop_facilitators.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :workshop_facilitator do
+    user_id 1
+    workshop_id 1
+    role "MyString"
+  end
+end

test/factories/workshop_requested_resources.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :workshop_requested_resource do
+    workshop_id 1
+    workshop_resource_id 1
+    status "MyString"
+  end
+end

test/factories/workshops.rb

@@ -0,0 +1,16 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :workshop do
+    title "MyString"
+    slug "MyString"
+    info "MyText"
+    conference_id 1
+    workshop_stream_id 1
+    workshop_presentation_style 1
+    min_facilitators 1
+    location_id 1
+    start_time "2014-03-13 20:56:47"
+    end_time "2014-03-13 20:56:47"
+  end
+end