From 1b4e9ee5e6d846d10deb5b2ab6fdea000acad0db Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:42:40 +0900
Subject: [PATCH 01/31] empty commit


From b777d1ba76efeb5a3958256c1c5d0ec00dbe23b0 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:14:33 +0900
Subject: [PATCH 02/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/controllers/blog_post_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/blog_post_page_controller_spec.rb b/spec/controllers/blog_post_page_controller_spec.rb
index 01a2db71b..cc3b887c1 100644
--- a/spec/controllers/blog_post_page_controller_spec.rb
+++ b/spec/controllers/blog_post_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe BlogPostPageController, type: :controller do
+RSpec.describe BlogPostPageController, type: :controller, scrivito: true do
   render_views
 
   describe "GET Blog Post Page" do

From 04d2b59569419fedec616fe2930b893efcedbc4f Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:16:31 +0900
Subject: [PATCH 03/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/controllers/sessions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 7f083909d..6b13e886a 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SessionsController, type: :controller do
+RSpec.describe SessionsController, type: :controller, scrivito: true do
   describe "GET #create" do
     it "param match" do
       get :create, params: { email: ENV['SCRIVITO_EMAIL'],

From 1004822632ae781f97e87504ff8b8613c31cb83a Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:16:41 +0900
Subject: [PATCH 04/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/controllers/sotechsha_overview_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sotechsha_overview_page_controller_spec.rb b/spec/controllers/sotechsha_overview_page_controller_spec.rb
index 91436f82c..6157e5d8b 100644
--- a/spec/controllers/sotechsha_overview_page_controller_spec.rb
+++ b/spec/controllers/sotechsha_overview_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SotechshaOverviewPageController, type: :controller do
+RSpec.describe SotechshaOverviewPageController, type: :controller, scrivito: true do
   render_views
 
   describe "GET #index" do

From 3ecb999cb3610564d06326184091a5beec466485 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:16:50 +0900
Subject: [PATCH 05/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/features/news_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/news_spec.rb b/spec/features/news_spec.rb
index 4cd5319bd..367d2c576 100644
--- a/spec/features/news_spec.rb
+++ b/spec/features/news_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'rails_helper'
 
-RSpec.feature "News", type: :feature do
+RSpec.feature "News", type: :feature, scrivito: true do
   describe "GET /news/2016/12/12/new-backend" do
     scenario "Title should be formatted" do
       visit "/news/2016/12/12/new-backend"

From ac85ee82a4809bfc234e6e308031f764e33e3f82 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:16:58 +0900
Subject: [PATCH 06/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/features/sotechsha_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/sotechsha_spec.rb b/spec/features/sotechsha_spec.rb
index 212641292..a8e1887cb 100644
--- a/spec/features/sotechsha_spec.rb
+++ b/spec/features/sotechsha_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'rails_helper'
 
-RSpec.feature "Sotechsha", type: :feature, retry: 3  do
+RSpec.feature "Sotechsha", type: :feature, scrivito: true, retry: 3  do
 
   describe "GET /sotechsha/num" do
     scenario "Quizzes should be permalink" do

From 1bdd95b2ac13ac90bf6a5fbf92db8bf12313ea1c Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:17:09 +0900
Subject: [PATCH 07/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/features/users_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 6aca92c61..55725e145 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -2,7 +2,7 @@
 require 'rails_helper'
 include Scrivito::ControllerHelper
 
-RSpec.feature "Users", type: :feature do
+RSpec.feature "Users", type: :feature, scrivito: true do
   subject { page }
 
   describe "log in" do

From b1e40734a4f5964e2aeb5049ac1608115437783b Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:17:15 +0900
Subject: [PATCH 08/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/requests/news_pages_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/news_pages_spec.rb b/spec/requests/news_pages_spec.rb
index 233a54bbd..feaead20f 100644
--- a/spec/requests/news_pages_spec.rb
+++ b/spec/requests/news_pages_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "NewsPages", type: :request do
+RSpec.describe "NewsPages", type: :request, scrivito: true do
   describe "GET /news/2016/12/12/new-backend" do
     it "Blog post should be rendered" do
       get '/news/2016/12/12/new-backend'

From 5d61ea7b8add37b13ef6cb208903645336c5a050 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:17:23 +0900
Subject: [PATCH 09/31] Add a tag of RSpec as `scrivito: true` in order to skip
 test

---
 spec/requests/sotechshas_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/sotechshas_spec.rb b/spec/requests/sotechshas_spec.rb
index 04b3e58b3..a9eb397af 100644
--- a/spec/requests/sotechshas_spec.rb
+++ b/spec/requests/sotechshas_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "Sotechshas", type: :request do
+RSpec.describe "Sotechshas", type: :request, scrivito: true do
 
   describe "Quizzes should be permalink" do
     it "Quizzes should be permalink" do

From a2e4b102039ee1c7c6ef17feb8c8319c5ca23c34 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:18:24 +0900
Subject: [PATCH 10/31] Remove dependency on Scrivito

Because `scriviton_path(Obj.root)` means `/`, we can replace to `root_url`.
---
 app/controllers/docs_controller.rb       | 2 +-
 spec/controllers/docs_controller_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/docs_controller.rb b/app/controllers/docs_controller.rb
index f8b046d68..b4604fe6e 100644
--- a/app/controllers/docs_controller.rb
+++ b/app/controllers/docs_controller.rb
@@ -7,7 +7,7 @@ def index
 
   def show
     @doc = Document.new(params[:id])
-    redirect_to scrivito_path(Obj.root) if not @doc.exists?
+    redirect_to root_url unless @doc.exists?
     @content = Kramdown::Document.new(@doc.content, input: 'GFM').to_html
     @url     = request.url
   end
diff --git a/spec/controllers/docs_controller_spec.rb b/spec/controllers/docs_controller_spec.rb
index d7421514c..0b1d53c7b 100644
--- a/spec/controllers/docs_controller_spec.rb
+++ b/spec/controllers/docs_controller_spec.rb
@@ -18,7 +18,7 @@
 
     it 'when invalid filename' do
       get :show, params: { id: '../not_found' }
-      expect(response).to redirect_to controller.scrivito_path(Obj.root)
+      expect(response).to redirect_to controller.root_url
       expect(response.status).to eq 302
     end
   end

From 0bfda549d52a433194a448a5f2d9cb5f0e09ac17 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:25:02 +0900
Subject: [PATCH 11/31] Move Scrivito' workspace configuration to
 initialization

---
 app/controllers/cms_controller.rb | 4 ----
 config/initializers/scrivito.rb   | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/cms_controller.rb b/app/controllers/cms_controller.rb
index e0a560007..1b86e1f2e 100644
--- a/app/controllers/cms_controller.rb
+++ b/app/controllers/cms_controller.rb
@@ -1,9 +1,5 @@
 class CmsController < ApplicationController
   include Scrivito::ControllerActions
 
-  title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
-  Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
-  Scrivito::Workspace.use(title)
-
   LoginPage.create(title: 'ログイン')
 end
diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index e105eb4fb..d883cd47c 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -23,3 +23,7 @@
     end
   end
 end
+
+title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
+Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
+Scrivito::Workspace.use(title)

From fdc24743be363e020f56151628d5e4ee4da780c7 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:39:21 +0900
Subject: [PATCH 12/31] Add conditions for Scrivito workspace configuration

---
 config/initializers/scrivito.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index d883cd47c..f3fd16f74 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -24,6 +24,10 @@
   end
 end
 
-title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
-Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
-Scrivito::Workspace.use(title)
+if Rails.env.in?(%w(production development)) ||
+    (Rails.env.test? && !ENV.key?('CI')) ||
+    (Rails.env.test? && ENV['CI'] == 'true' && ENV['SCRIVITO_TEST'] == 'true')
+  title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
+  Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
+  Scrivito::Workspace.use(title)
+end

From c753b18b707964e2f9ff4b3c8ac9f97819732844 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 02:40:16 +0900
Subject: [PATCH 13/31] Run the test excluding `scrivito` tag, if build from
 forked repo

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1dc8dd66c..50430d735 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,9 @@ cache:
   - bundler
 script:
   - bundle exec rake db:migrate --trace
-  - bundle exec rake
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then SCRIVITO_TEST=true bundle exec rspec spec; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then SCRIVITO_TEST=true bundle exec rspec spec; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" != "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec --tag ~@scrivito; fi'
 env:
   global:
     - TZ='Asia/Tokyo'

From a79cb9e8255870c9703d8a80b0e053aa32414932 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:02:21 +0900
Subject: [PATCH 14/31] Dummy configurations for Scrivito

---
 config/initializers/scrivito.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index f3fd16f74..b254490e2 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -5,9 +5,8 @@
   # If not explicitly set, the tenant and the API key are obtained from the environment variables
   # SCRIVITO_TENANT and SCRIVITO_API_KEY.
   #
-  # config.tenant = 'my-tenant-123'
-  # config.api_key = 'secret'
-  #
+  config.tenant = ENV.fetch('SCRIVITO_TENANT', 'dummy-tenant')
+  config.api_key = ENV.fetch('SCRIVITO_API_KEY', 'dummy-api-key')
 
   # Disable the default routes to allow route configuration
   config.inject_preset_routes = false

From 98909222959a018c4de8603bf505632d45fdb86f Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:15:23 +0900
Subject: [PATCH 15/31] Stringify class name

---
 spec/controllers/blog_post_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/blog_post_page_controller_spec.rb b/spec/controllers/blog_post_page_controller_spec.rb
index cc3b887c1..11a3a378f 100644
--- a/spec/controllers/blog_post_page_controller_spec.rb
+++ b/spec/controllers/blog_post_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe BlogPostPageController, type: :controller, scrivito: true do
+RSpec.describe 'BlogPostPageController', type: :controller, scrivito: true do
   render_views
 
   describe "GET Blog Post Page" do

From f989f6592d096d936a399f31b144836cd1e38960 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:15:37 +0900
Subject: [PATCH 16/31] Stringify class name

---
 spec/controllers/sessions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 6b13e886a..fd6853d9d 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SessionsController, type: :controller, scrivito: true do
+RSpec.describe 'SessionsController', type: :controller, scrivito: true do
   describe "GET #create" do
     it "param match" do
       get :create, params: { email: ENV['SCRIVITO_EMAIL'],

From bfb9c8cce44c898825ebe035a9f8beceaea4c840 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:15:41 +0900
Subject: [PATCH 17/31] Stringify class name

---
 spec/controllers/sotechsha_overview_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sotechsha_overview_page_controller_spec.rb b/spec/controllers/sotechsha_overview_page_controller_spec.rb
index 6157e5d8b..9cb7263df 100644
--- a/spec/controllers/sotechsha_overview_page_controller_spec.rb
+++ b/spec/controllers/sotechsha_overview_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SotechshaOverviewPageController, type: :controller, scrivito: true do
+RSpec.describe 'SotechshaOverviewPageController', type: :controller, scrivito: true do
   render_views
 
   describe "GET #index" do

From 0e17720524c031834352803365583da8b97b7d7a Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:20:56 +0900
Subject: [PATCH 18/31] Revert "Dummy configurations for Scrivito"

This reverts commit b882f0d706d48107c2673a5c324980c79aba522e.
---
 config/initializers/scrivito.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index b254490e2..f3fd16f74 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -5,8 +5,9 @@
   # If not explicitly set, the tenant and the API key are obtained from the environment variables
   # SCRIVITO_TENANT and SCRIVITO_API_KEY.
   #
-  config.tenant = ENV.fetch('SCRIVITO_TENANT', 'dummy-tenant')
-  config.api_key = ENV.fetch('SCRIVITO_API_KEY', 'dummy-api-key')
+  # config.tenant = 'my-tenant-123'
+  # config.api_key = 'secret'
+  #
 
   # Disable the default routes to allow route configuration
   config.inject_preset_routes = false

From 06d2a810a1d08b1fc61f54fee793b6bd40db31be Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:25:24 +0900
Subject: [PATCH 19/31] Simplify conditions for Scrivito workspace
 configuration

---
 config/initializers/scrivito.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index f3fd16f74..447ea2205 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -24,9 +24,7 @@
   end
 end
 
-if Rails.env.in?(%w(production development)) ||
-    (Rails.env.test? && !ENV.key?('CI')) ||
-    (Rails.env.test? && ENV['CI'] == 'true' && ENV['SCRIVITO_TEST'] == 'true')
+if ENV.key?('SCRIVITO_TENANT') && ENV.key?('SCRIVITO_API_KEY')
   title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
   Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
   Scrivito::Workspace.use(title)

From 66f961dc787887662838b7000971617e9e37f2a7 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 03:28:36 +0900
Subject: [PATCH 20/31] Remove useless an environment variable

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50430d735..cf39234ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ cache:
   - bundler
 script:
   - bundle exec rake db:migrate --trace
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then SCRIVITO_TEST=true bundle exec rspec spec; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then SCRIVITO_TEST=true bundle exec rspec spec; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bundle exec rspec spec; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec; fi'
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" != "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec --tag ~@scrivito; fi'
 env:
   global:

From a7ff606981bc900eec6dbfff5ce3ccc93938f9af Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:04:01 +0900
Subject: [PATCH 21/31] Workaround for described class

---
 spec/controllers/blog_post_page_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/controllers/blog_post_page_controller_spec.rb b/spec/controllers/blog_post_page_controller_spec.rb
index 11a3a378f..bf47d8bce 100644
--- a/spec/controllers/blog_post_page_controller_spec.rb
+++ b/spec/controllers/blog_post_page_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe 'BlogPostPageController', type: :controller, scrivito: true do
+  before { @controller = BlogPostPageController.new }
+
   render_views
 
   describe "GET Blog Post Page" do

From 93fbe3a0c3f2c484b1e1ff2d21aae6e8ca280274 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:04:53 +0900
Subject: [PATCH 22/31] Workaround for described class

---
 spec/controllers/sessions_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index fd6853d9d..057616725 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe 'SessionsController', type: :controller, scrivito: true do
+  before { @controller = SessionsController.new }
+
   describe "GET #create" do
     it "param match" do
       get :create, params: { email: ENV['SCRIVITO_EMAIL'],

From 3a10953a7dc5b07382d67c496fbd8d7a92d2ef19 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:04:59 +0900
Subject: [PATCH 23/31] Workaround for described class

---
 spec/controllers/sotechsha_overview_page_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/controllers/sotechsha_overview_page_controller_spec.rb b/spec/controllers/sotechsha_overview_page_controller_spec.rb
index 9cb7263df..cd3e6821f 100644
--- a/spec/controllers/sotechsha_overview_page_controller_spec.rb
+++ b/spec/controllers/sotechsha_overview_page_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe 'SotechshaOverviewPageController', type: :controller, scrivito: true do
+  before { @controller = SotechshaOverviewPageController.new }
+
   render_views
 
   describe "GET #index" do

From 57386bbcb73d25d114b939d0c2d7131aec4e9fb2 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:36:04 +0900
Subject: [PATCH 24/31] Move LoginPage creation to initialization

see: https://scrivito.com/adding-a-log-in-page-to-your-application-71c659702470e21c
---
 app/controllers/cms_controller.rb | 2 --
 config/initializers/scrivito.rb   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/cms_controller.rb b/app/controllers/cms_controller.rb
index 1b86e1f2e..b30b7363e 100644
--- a/app/controllers/cms_controller.rb
+++ b/app/controllers/cms_controller.rb
@@ -1,5 +1,3 @@
 class CmsController < ApplicationController
   include Scrivito::ControllerActions
-
-  LoginPage.create(title: 'ログイン')
 end
diff --git a/config/initializers/scrivito.rb b/config/initializers/scrivito.rb
index 447ea2205..282399047 100644
--- a/config/initializers/scrivito.rb
+++ b/config/initializers/scrivito.rb
@@ -28,4 +28,6 @@
   title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
   Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
   Scrivito::Workspace.use(title)
+
+  LoginPage.create(title: 'ログイン')
 end

From c90ccc30f554a678fdebfef592410a1ebbf9169c Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:52:26 +0900
Subject: [PATCH 25/31] Revert "Workaround for described class"

This reverts commit 3a10953a7dc5b07382d67c496fbd8d7a92d2ef19.
---
 spec/controllers/sotechsha_overview_page_controller_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/controllers/sotechsha_overview_page_controller_spec.rb b/spec/controllers/sotechsha_overview_page_controller_spec.rb
index cd3e6821f..9cb7263df 100644
--- a/spec/controllers/sotechsha_overview_page_controller_spec.rb
+++ b/spec/controllers/sotechsha_overview_page_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe 'SotechshaOverviewPageController', type: :controller, scrivito: true do
-  before { @controller = SotechshaOverviewPageController.new }
-
   render_views
 
   describe "GET #index" do

From 741456adb1cc6891223692e2e6777d752168d360 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:52:35 +0900
Subject: [PATCH 26/31] Revert "Workaround for described class"

This reverts commit 93fbe3a0c3f2c484b1e1ff2d21aae6e8ca280274.
---
 spec/controllers/sessions_controller_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 057616725..fd6853d9d 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe 'SessionsController', type: :controller, scrivito: true do
-  before { @controller = SessionsController.new }
-
   describe "GET #create" do
     it "param match" do
       get :create, params: { email: ENV['SCRIVITO_EMAIL'],

From 3d72002001cefec1e0ee7869b5ebd509aa3caccf Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:52:46 +0900
Subject: [PATCH 27/31] Revert "Workaround for described class"

This reverts commit a7ff606981bc900eec6dbfff5ce3ccc93938f9af.
---
 spec/controllers/blog_post_page_controller_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/controllers/blog_post_page_controller_spec.rb b/spec/controllers/blog_post_page_controller_spec.rb
index bf47d8bce..11a3a378f 100644
--- a/spec/controllers/blog_post_page_controller_spec.rb
+++ b/spec/controllers/blog_post_page_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe 'BlogPostPageController', type: :controller, scrivito: true do
-  before { @controller = BlogPostPageController.new }
-
   render_views
 
   describe "GET Blog Post Page" do

From 543e82473538ecd8496ed2e0cbd5f94efb4b67ef Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:53:08 +0900
Subject: [PATCH 28/31] Revert "Stringify class name"

This reverts commit bfb9c8cce44c898825ebe035a9f8beceaea4c840.
---
 spec/controllers/sotechsha_overview_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sotechsha_overview_page_controller_spec.rb b/spec/controllers/sotechsha_overview_page_controller_spec.rb
index 9cb7263df..6157e5d8b 100644
--- a/spec/controllers/sotechsha_overview_page_controller_spec.rb
+++ b/spec/controllers/sotechsha_overview_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'SotechshaOverviewPageController', type: :controller, scrivito: true do
+RSpec.describe SotechshaOverviewPageController, type: :controller, scrivito: true do
   render_views
 
   describe "GET #index" do

From 28ea8f729df28a4f6071a120542ae3dcbae6eafa Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:53:19 +0900
Subject: [PATCH 29/31] Revert "Stringify class name"

This reverts commit f989f6592d096d936a399f31b144836cd1e38960.
---
 spec/controllers/sessions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index fd6853d9d..6b13e886a 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'SessionsController', type: :controller, scrivito: true do
+RSpec.describe SessionsController, type: :controller, scrivito: true do
   describe "GET #create" do
     it "param match" do
       get :create, params: { email: ENV['SCRIVITO_EMAIL'],

From 9663632c4c73ed717996bda08e142df8f6fa58a3 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 04:53:30 +0900
Subject: [PATCH 30/31] Revert "Stringify class name"

This reverts commit 98909222959a018c4de8603bf505632d45fdb86f.
---
 spec/controllers/blog_post_page_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/blog_post_page_controller_spec.rb b/spec/controllers/blog_post_page_controller_spec.rb
index 11a3a378f..cc3b887c1 100644
--- a/spec/controllers/blog_post_page_controller_spec.rb
+++ b/spec/controllers/blog_post_page_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'BlogPostPageController', type: :controller, scrivito: true do
+RSpec.describe BlogPostPageController, type: :controller, scrivito: true do
   render_views
 
   describe "GET Blog Post Page" do

From 3711877bb8662f9811f0c8e26f9a52ebd5b7e7c0 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 26 Nov 2017 05:03:07 +0900
Subject: [PATCH 31/31] Remove quotations

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf39234ce..39839b347 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,9 @@ cache:
   - bundler
 script:
   - bundle exec rake db:migrate --trace
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bundle exec rspec spec; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" != "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec --tag ~@scrivito; fi'
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bundle exec rspec spec; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" != "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec --tag ~@scrivito; fi
 env:
   global:
     - TZ='Asia/Tokyo'