From 9f6ad65d735c3d95a2fedfd2bf1582bbc3c301e8 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Fri, 13 Apr 2012 18:32:35 -0700 Subject: [PATCH] update schema, views spec --- db/schema.rb | 15 ++++++++++++++- spec/javascripts/app/views_spec.js | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 7e9fff21b..5dbac0d3f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120330144057) do +ActiveRecord::Schema.define(:version => 20120414005431) do create_table "account_deletions", :force => true do |t| t.string "diaspora_handle" @@ -372,6 +372,19 @@ ActiveRecord::Schema.define(:version => 20120330144057) do add_index "profiles", ["full_name"], :name => "index_profiles_on_full_name" add_index "profiles", ["person_id"], :name => "index_profiles_on_person_id" + create_table "rails_admin_histories", :force => true do |t| + t.text "message" + t.string "username" + t.integer "item" + t.string "table" + t.integer "month", :limit => 2 + t.integer "year", :limit => 8 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "rails_admin_histories", ["item", "table", "month", "year"], :name => "index_rails_admin_histories" + create_table "service_users", :force => true do |t| t.string "uid", :null => false t.string "name", :null => false diff --git a/spec/javascripts/app/views_spec.js b/spec/javascripts/app/views_spec.js index ef0448216..e26eba16a 100644 --- a/spec/javascripts/app/views_spec.js +++ b/spec/javascripts/app/views_spec.js @@ -73,9 +73,9 @@ describe("app.views.Base", function(){ it("initializes tooltips declared with the view's tooltipSelector property", function(){ this.view.tooltipSelector = ".christopher_columbus, .barrack_obama, .block_user" - spyOn($.fn, "twipsy") + spyOn($.fn, "tooltip") this.view.render() - expect($.fn.twipsy.mostRecentCall.object.selector).toBe(".christopher_columbus, .barrack_obama, .block_user") + expect($.fn.tooltip.mostRecentCall.object.selector).toBe(".christopher_columbus, .barrack_obama, .block_user") }) }) })