Skip to content

Commit

Permalink
use circleci/ruby:2.6-stretch-node-browsers and postgres:11
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Jul 13, 2019
1 parent be6f635 commit 89e1678
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
build:
docker:
# specify the version you desire here
- image: circleci/ruby:2.5-node-browsers
- image: circleci/ruby:2.6-stretch-node-browsers
environment:
PGHOST: 127.0.0.1
PGUSER: postgres

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
- image: circleci/postgres:10
- image: circleci/postgres:11
environment:
POSTGRES_USER: postgres
POSTGRES_DB: enju_inventory_dummy_test
Expand Down
2 changes: 1 addition & 1 deletion enju_inventory.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|

s.add_development_dependency "enju_leaf", "~> 1.4.0.beta.1"
s.add_development_dependency "pg"
s.add_development_dependency "sunspot_solr", "~> 2.4"
s.add_development_dependency "sunspot_solr", "~> 2.5"
s.add_development_dependency "rspec-rails", "~> 3.8"
s.add_development_dependency "factory_bot_rails"
s.add_development_dependency "simplecov"
Expand Down
27 changes: 22 additions & 5 deletions spec/fixtures/roles.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,38 @@
---
role_00001:
name: Guest
display_name: Guest
display_name_translations: {"en": "Guest", "ja": "ゲスト"}
id: 1
note:
position: 1
role_00002:
name: User
display_name: User
display_name_translations: {"en": "User", "ja": "一般利用者"}
id: 2
note:
position: 2
role_00003:
name: Librarian
display_name: Librarian
display_name_translations: {"en": "Librarian", "ja": "図書館員"}
id: 3
note:
position: 3
role_00004:
name: Administrator
display_name: Administrator
display_name_translations: {"en": "Administrator", "ja": "管理者"}
id: 4
note:
note:
position: 4

# == Schema Information
#
# Table name: roles
#
# id :bigint not null, primary key
# name :string not null
# display_name_translations :jsonb not null
# note :text
# position :integer default(1), not null
# created_at :datetime not null
# updated_at :datetime not null
#

0 comments on commit 89e1678

Please sign in to comment.