update schema, views spec
This commit is contained in:
parent
ecc1a84b42
commit
9f6ad65d73
2 changed files with 16 additions and 3 deletions
15
db/schema.rb
15
db/schema.rb
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# 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|
|
create_table "account_deletions", :force => true do |t|
|
||||||
t.string "diaspora_handle"
|
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", ["full_name"], :name => "index_profiles_on_full_name"
|
||||||
add_index "profiles", ["person_id"], :name => "index_profiles_on_person_id"
|
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|
|
create_table "service_users", :force => true do |t|
|
||||||
t.string "uid", :null => false
|
t.string "uid", :null => false
|
||||||
t.string "name", :null => false
|
t.string "name", :null => false
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,9 @@ describe("app.views.Base", function(){
|
||||||
it("initializes tooltips declared with the view's tooltipSelector property", function(){
|
it("initializes tooltips declared with the view's tooltipSelector property", function(){
|
||||||
this.view.tooltipSelector = ".christopher_columbus, .barrack_obama, .block_user"
|
this.view.tooltipSelector = ".christopher_columbus, .barrack_obama, .block_user"
|
||||||
|
|
||||||
spyOn($.fn, "twipsy")
|
spyOn($.fn, "tooltip")
|
||||||
this.view.render()
|
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")
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue