From 56a31851756c9f118cb506bb0eebfa766a29b2f9 Mon Sep 17 00:00:00 2001
From: onozaty <onozaty@gmail.com>
Date: Thu, 6 Feb 2025 23:53:24 +0900
Subject: [PATCH 1/5] Update agileware-jp/redmine-plugin

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b48daf2..c98f2a9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  redmine-plugin: agileware-jp/redmine-plugin@3.6.0
+  redmine-plugin: agileware-jp/redmine-plugin@3.8.0
 
 jobs:
   run_tests:
@@ -62,10 +62,10 @@ workflows:
   test:
     jobs:
       - run_tests:
-          name: latest Redmine (5.1) with PostgreSQL
+          name: latest Redmine with PostgreSQL
           database: pg
       - run_tests:
-          name: latest Redmine (5.1) with MySQL
+          name: latest Redmine with MySQL
           database: mysql
       - run_tests:
           name: redmine-4.2 with PostgreSQL

From fbeb6ef2c7044f6a3490d4af8fb8718ccd1fd4e2 Mon Sep 17 00:00:00 2001
From: onozaty <onozaty@gmail.com>
Date: Sat, 8 Feb 2025 23:55:27 +0900
Subject: [PATCH 2/5] Add DevContainer settings

---
 .devcontainer/devcontainer.json  |  6 ++++++
 .devcontainer/docker-compose.yml | 23 +++++++++++++++++++++++
 Vagrantfile                      | 10 ----------
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100644 .devcontainer/docker-compose.yml
 delete mode 100644 Vagrantfile

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..7305930
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,6 @@
+{
+  "name": "Redmine",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "redmine",
+  "workspaceFolder": "/usr/src/redmine/plugins/view_customize"
+}
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000..65e2810
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,23 @@
+services:
+  redmine:
+    image: redmine
+    restart: always
+    ports:
+      - 8080:3000
+    environment:
+      REDMINE_DB_POSTGRES: db
+      REDMINE_DB_PASSWORD: example
+    volumes:
+      - redmine-files:/usr/src/redmine/files
+      - ./..:/usr/src/redmine/plugins/view_customize
+  db:
+    image: postgres:latest
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: example
+      POSTGRES_DB: redmine
+volumes:
+  redmine-files:
+  postgres-data:
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 5fe2f3e..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,10 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "onozaty/redmine-5.0"
-  config.vm.network "private_network", ip: "192.168.33.10"
-
-  config.vm.synced_folder ".", "/var/lib/redmine/plugins/view_customize", create: true, mount_options: ['dmode=755','fmode=655']
-
-  config.vm.provider "virtualbox" do |vb|
-    vb.memory = "1024"
-  end
-end

From b92006f3f7219b83b6909896935f67f93fa4803c Mon Sep 17 00:00:00 2001
From: onozaty <onozaty@gmail.com>
Date: Mon, 10 Feb 2025 01:04:46 +0900
Subject: [PATCH 3/5] Add DevContainer settings

---
 .devcontainer/Dockerfile                         |  8 ++++++++
 .devcontainer/database.yml                       | 16 ++++++++++++++++
 .../create-test-database.sql                     |  2 ++
 .devcontainer/devcontainer.json                  | 11 ++++++++++-
 .devcontainer/docker-compose.yml                 |  6 +++++-
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .devcontainer/Dockerfile
 create mode 100644 .devcontainer/database.yml
 create mode 100644 .devcontainer/db/docker-entrypoint-initdb.d/create-test-database.sql

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..99b4673
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,8 @@
+FROM redmine:6.0.3
+
+# 必要なパッケージをインストール
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    libssl-dev \
+    libreadline-dev \
+    zlib1g-dev
diff --git a/.devcontainer/database.yml b/.devcontainer/database.yml
new file mode 100644
index 0000000..8c4c4fd
--- /dev/null
+++ b/.devcontainer/database.yml
@@ -0,0 +1,16 @@
+production:
+  adapter: postgresql
+  host: "db"
+  port: "5432"
+  username: "postgres"
+  password: "example"
+  database: "postgres"
+  encoding: "utf8"
+test:
+  adapter: postgresql
+  host: "db"
+  port: "5432"
+  username: "postgres"
+  password: "example"
+  database: "test"
+  encoding: "utf8"
diff --git a/.devcontainer/db/docker-entrypoint-initdb.d/create-test-database.sql b/.devcontainer/db/docker-entrypoint-initdb.d/create-test-database.sql
new file mode 100644
index 0000000..22d7491
--- /dev/null
+++ b/.devcontainer/db/docker-entrypoint-initdb.d/create-test-database.sql
@@ -0,0 +1,2 @@
+CREATE DATABASE test;
+GRANT ALL PRIVILEGES ON DATABASE test TO postgres;
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7305930..75bac87 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,5 +2,14 @@
   "name": "Redmine",
   "dockerComposeFile": "docker-compose.yml",
   "service": "redmine",
-  "workspaceFolder": "/usr/src/redmine/plugins/view_customize"
+  "remoteUser": "redmine",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+      }
+    }
+  },
+  "workspaceFolder": "/usr/src/redmine/plugins/view_customize",
+  "postCreateCommand": "cd /usr/src/redmine && bundle config set without development && bundle install --verbose && bundle exec rails db:migrate:reset RAILS_ENV=test && bundle exec rake redmine:plugins:migrate RAILS_ENV=production && bundle exec rake redmine:plugins:migrate RAILS_ENV=test"
 }
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 65e2810..c0d2aef 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,6 +1,8 @@
 services:
   redmine:
-    image: redmine
+    build:
+      context: .
+      dockerfile: Dockerfile
     restart: always
     ports:
       - 8080:3000
@@ -9,12 +11,14 @@ services:
       REDMINE_DB_PASSWORD: example
     volumes:
       - redmine-files:/usr/src/redmine/files
+      - ./database.yml:/usr/src/redmine/config/database.yml
       - ./..:/usr/src/redmine/plugins/view_customize
   db:
     image: postgres:latest
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
+      - ./db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
     environment:
       POSTGRES_PASSWORD: example
       POSTGRES_DB: redmine

From b492edcdcca44c68e71117a26c900b964dbae8f4 Mon Sep 17 00:00:00 2001
From: onozaty <onozaty@gmail.com>
Date: Tue, 11 Feb 2025 22:35:51 +0900
Subject: [PATCH 4/5] Fix failing test

---
 test/unit/view_customize_view_hook_test.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/unit/view_customize_view_hook_test.rb b/test/unit/view_customize_view_hook_test.rb
index 7369d32..babe658 100644
--- a/test/unit/view_customize_view_hook_test.rb
+++ b/test/unit/view_customize_view_hook_test.rb
@@ -72,9 +72,16 @@ def test_view_layouts_base_html_head
 
     expected = Regexp.escape("\n")
     expected << Regexp.escape("<!-- [view customize plugin] path:/issues -->\n")
+    expected << "("
     expected << Regexp.escape("<link rel=\"stylesheet\" media=\"screen\" href=\"/plugin_assets/view_customize/stylesheets/view_customize.css?")
     expected << "[0-9]+"
-    expected << Regexp.escape("\" /><script type=\"text/javascript\">\n")
+    expected << Regexp.escape("\" />")
+    expected << "|"
+    expected << Regexp.escape("<link rel=\"stylesheet\" href=\"/assets/plugin_assets/view_customize/view_customize-")
+    expected << "[0-9a-z]+"
+    expected << Regexp.escape(".css\" media=\"screen\" />")
+    expected << ")"
+    expected << Regexp.escape("<script type=\"text/javascript\">\n")
     expected << Regexp.escape("//<![CDATA[\n")
     expected << Regexp.escape("ViewCustomize = { context: {\"user\":{\"id\":1,\"login\":\"admin\",\"admin\":true,\"firstname\":\"Redmine\",\"lastname\":\"Admin\",\"mail\":\"admin@somenet.foo\",\"lastLoginOn\":\"2006-07-19T20:57:52Z\",\"groups\":[],\"apiKey\":null,\"customFields\":[{\"id\":4,\"name\":\"Phone number\",\"value\":null},{\"id\":5,\"name\":\"Money\",\"value\":null}]},\"project\":{\"id\":1,\"identifier\":\"ecookbook\",\"name\":\"eCookbook\",\"roles\":[{\"id\":4,\"name\":\"Non member\"}],\"customFields\":[{\"id\":3,\"name\":\"Development status\",\"value\":\"Stable\"}]}} };\n")
     expected << Regexp.escape("//]]>\n")

From 8a8ac0dcc1ca246e9a7263f6b6cda0f8d5d88f69 Mon Sep 17 00:00:00 2001
From: onozaty <onozaty@gmail.com>
Date: Tue, 11 Feb 2025 22:43:49 +0900
Subject: [PATCH 5/5] Add CircleCI test patterns

---
 .circleci/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c98f2a9..9ea7e6f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
         default: redmine
       ruby_version:
         type: string
-        default: "3.2" # https://github.com/redmine/redmine/blob/5.1.0/Gemfile#L3
+        default: "3.3" # https://github.com/redmine/redmine/blob/5.0.3/Gemfile#L3
       database:
         type: enum
         enum:
@@ -68,12 +68,17 @@ workflows:
           name: latest Redmine with MySQL
           database: mysql
       - run_tests:
-          name: redmine-4.2 with PostgreSQL
-          redmine_version: "4.2.10"
-          ruby_version: "2.7" # https://github.com/redmine/redmine/blob/4.2.10/Gemfile#L3
+          name: redmine-5.1.6 with PostgreSQL
+          redmine_version: "5.1.6"
+          ruby_version: "3.2" # https://github.com/redmine/redmine/blob/5.1.6/Gemfile#L3
+          database: pg
+      - run_tests:
+          name: redmine-5.0.11 with PostgreSQL
+          redmine_version: "5.0.11"
+          ruby_version: "3.1" # https://github.com/redmine/redmine/blob/5.0.11/Gemfile#L3
           database: pg
       - run_tests:
-          name: redmine-4.2 with MySQL
+          name: redmine-4.2 with PostgreSQL
           redmine_version: "4.2.10"
           ruby_version: "2.7" # https://github.com/redmine/redmine/blob/4.2.10/Gemfile#L3
-          database: mysql
+          database: pg