From f18439fa1476855d6f54ddf5a1750e425d6ba3e9 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Tue, 28 Dec 2010 21:08:54 -0800
Subject: [PATCH] ZOMG specs pass on mysql! Make '_type' column on services
into 'type'.
---
db/migrate/0000_create_schema.rb | 2 +-
db/schema.rb | 2 +-
lib/collect_user_photos.rb | 2 +-
spec/controllers/services_controller_spec.rb | 2 ++
spec/factories.rb | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb
index 073ec8c4c0..7d27bf5fd2 100644
--- a/db/migrate/0000_create_schema.rb
+++ b/db/migrate/0000_create_schema.rb
@@ -131,7 +131,7 @@ class CreateSchema < ActiveRecord::Migration
add_index :requests, [:sender_id, :recipient_id], :unique => true
create_table :services do |t|
- t.string :_type
+ t.string :type
t.integer :user_id
t.string :provider
t.string :uid
diff --git a/db/schema.rb b/db/schema.rb
index 4a1e22461f..96416285b0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -162,7 +162,7 @@ ActiveRecord::Schema.define(:version => 0) do
add_index "requests", ["sender_id"], :name => "index_requests_on_sender_id"
create_table "services", :force => true do |t|
- t.string "_type"
+ t.string "type"
t.integer "user_id"
t.string "provider"
t.string "uid"
diff --git a/lib/collect_user_photos.rb b/lib/collect_user_photos.rb
index f59c737480..9e4c5befd8 100644
--- a/lib/collect_user_photos.rb
+++ b/lib/collect_user_photos.rb
@@ -5,7 +5,7 @@ module PhotoMover
FileUtils::mkdir_p temp_dir
Dir.chdir 'tmp/exports'
- photos = user.visible_posts(:person_id => user.person.id, :_type => 'Photo')
+ photos = user.visible_posts(:person_id => user.person.id, :type => 'Photo')
photos_dir = "#{user.id}/photos"
FileUtils::mkdir_p photos_dir
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index ab561f1110..d940243c6e 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -62,9 +62,11 @@ describe ServicesController do
it 'creates a twitter service' do
+ Service.delete_all
user.getting_started = false
request.env['omniauth.auth'] = omniauth_auth
post :create
+ user.reload
user.services.first.class.name.should == "Services::Twitter"
end
end
diff --git a/spec/factories.rb b/spec/factories.rb
index 3b32a134b1..dca92bf5a5 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -72,7 +72,7 @@ Factory.define :service do |service|
service.sequence(:access_token) { |token| "12345#{token}" }
service.sequence(:access_secret) { |token| "98765#{token}" }
service.after_build do |s|
- s._type = "Services::#{s.provider.camelize}"
+ s.type = "Services::#{s.provider.camelize}"
end
end
--
GitLab