Skip to content

Commit

Permalink
update spec files
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Jul 6, 2016
1 parent b924f42 commit 1e48eb4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: ruby
cache: bundler
rvm:
- 2.1.8
- 2.2.4
- 2.3.0
- 2.1.9
- 2.2.5
- 2.3.1
before_script:
- mysql -e 'create database enju_test'
- psql -c 'create database enju_test;' -U postgres
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ gem "enju_leaf", github: "next-l/enju_leaf", branch: "master"
gem "enju_biblio", github: "next-l/enju_biblio", branch: "master"
gem "enju_library", github: "next-l/enju_library", branch: "master"
gem "enju_manifestation_viewer", github: "next-l/enju_manifestation_viewer", branch: "master"
gem "globalize", github: "globalize/globalize"
gem "coveralls", require: false, group: :test

# To use a debugger
Expand Down
1 change: 1 addition & 0 deletions spec/dummy/app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
include EnjuBiblio::Controller
include EnjuLibrary::Controller
include EnjuPurchaseRequest::Controller
before_action :set_paper_trail_whodunnit
after_action :verify_authorized

include Pundit
Expand Down
3 changes: 2 additions & 1 deletion spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20150305030046) do
ActiveRecord::Schema.define(version: 20160703190738) do

create_table "accepts", force: :cascade do |t|
t.integer "basket_id"
Expand Down Expand Up @@ -618,6 +618,7 @@
t.integer "order_list_id"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "most_recent"
end

add_index "order_list_transitions", ["order_list_id"], name: "index_order_list_transitions_on_order_list_id"
Expand Down
4 changes: 2 additions & 2 deletions spec/support/devise.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSpec.configure do |config|
config.include Devise::TestHelpers, :type => :controller
config.include Devise::TestHelpers, :type => :view
config.include Devise::Test::ControllerHelpers, type: :controller
config.include Devise::Test::ControllerHelpers, type: :view
end

0 comments on commit 1e48eb4

Please sign in to comment.