From 0409d968e5b462156b64f9c0f12a95095f4d9d26 Mon Sep 17 00:00:00 2001 From: "Arai,Mio|Mio|ECID" Date: Wed, 18 Sep 2024 17:10:17 +0900 Subject: [PATCH 1/3] change parent branch from master to develop --- myapp/.bundle/config | 2 ++ steps_en.md | 5 ++--- steps_jp.md | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 myapp/.bundle/config diff --git a/myapp/.bundle/config b/myapp/.bundle/config new file mode 100644 index 0000000000..fc36e026e3 --- /dev/null +++ b/myapp/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_BUILD__MYSQL2: "--with-ldflags=-L/usr/local/opt/openssl/lib" diff --git a/steps_en.md b/steps_en.md index 8ba07f59f8..7e0d33d5a1 100644 --- a/steps_en.md +++ b/steps_en.md @@ -97,8 +97,8 @@ Open chrome://extensions/, enable Developer mode at the top right, and install t ### Step 2: Initialize the Repository - Create a new branch. - - Create a branch with your account name based on the master branch. - - `git checkout -b github_account_name origin/master` + - Create a branch with your account name based on the develop branch. + - `git checkout -b github_account_name origin/develop` - After creating the branch, push it. ### Step 3: Create a Rails Project @@ -294,7 +294,6 @@ Start with a simple configuration where only the task name and details can be re 1. [Dockerfile](https://qiita.com/ngron/items/f61b8635b4d67f666d75#failed-to-read-the-sessionstorage-property-from-window-storage-is-disabled-inside-data-urls) 2. [spec/rails_helper.rb](https://commis.hatenablog.com/entry/2018/11/16/171608) - - feature specですと `database_cleaner` という gemは必要でしたが、 system specに変更することで `database_cleaner` の導入が要らなくなった - Introduce CI tools such as CircleCI and set them up to notify Slack. - If conducting PR exchanges within Fablic/training, introducing CI tools is optional. CircleCI cannot be executed as admin privileges are unavailable, even if .circleci/config.yml is set up. - Reference book：https://leanpub.com/everydayrailsrspec-jp diff --git a/steps_jp.md b/steps_jp.md index 220d64cecf..79dba9eba4 100644 --- a/steps_jp.md +++ b/steps_jp.md @@ -105,8 +105,8 @@ chrome://extensions/ を開いて右上のDeveloper modeをオンにして、RKG ### ステップ2: リポジトリの初期設定をしよう - ブランチを作成しましょう - - masterブランチを元に自分のアカウント名と同じ名前で作成してください - - `git checkout -b github_account_name origin/master` + - developブランチを元に自分のアカウント名と同じ名前で作成してください + - `git checkout -b github_account_name origin/develop` - 作成したらpushしましょう ### ステップ3: Railsプロジェクトを作成しよう From a142375b5bfbd0ab01f6154d6381435570ed377b Mon Sep 17 00:00:00 2001 From: "Arai,Mio|Mio|ECID" Date: Wed, 18 Sep 2024 17:11:24 +0900 Subject: [PATCH 2/3] remove needless feature spec description --- steps_jp.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/steps_jp.md b/steps_jp.md index 79dba9eba4..733516d826 100644 --- a/steps_jp.md +++ b/steps_jp.md @@ -295,14 +295,13 @@ chrome://extensions/ を開いて右上のDeveloper modeをオンにして、RKG ``` - specを書くための準備をしましょう - `spec/spec_helper.rb` 、 `spec/rails_helper.rb` を用意しましょう -- ~~feature spec~~ system specをタスク機能に対して書きましょう +- system specをタスク機能に対して書きましょう - Rails 5.1 以降、新たにsystem testの機能を追加しました - [日本語](https://qiita.com/jnchito/items/c7e6e7abf83598a6516d), [英語](https://rossta.net/blog/why-rails-system-tests-matter.html) - dockerを利用して研修を行う場合、以下の設定が必要です。 1. [Dockerfile](https://qiita.com/ngron/items/f61b8635b4d67f666d75#failed-to-read-the-sessionstorage-property-from-window-storage-is-disabled-inside-data-urls) 2. [spec/rails_helper.rb](https://commis.hatenablog.com/entry/2018/11/16/171608) - - feature specですと `database_cleaner` という gemは必要でしたが、 system specに変更することで `database_cleaner` の導入が要らなくなった - Circle CIなどのCIツールを導入して、Slackに通知するようにしましょう - Fablic/training内でPRのやり取りをする場合、CIツールの導入は任意(optional)です。CircleCIのAdmin権限が無いので、`.circleci/config.yml`を設定しても実行できないです。 - 参考書籍：https://leanpub.com/everydayrailsrspec-jp From aec6b080f0ff3db0156302fe3b61f4d7c6cc2cd7 Mon Sep 17 00:00:00 2001 From: "Arai,Mio|Mio|ECID" Date: Wed, 18 Sep 2024 22:30:27 +0900 Subject: [PATCH 3/3] remove necessary file --- myapp/.bundle/config | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 myapp/.bundle/config diff --git a/myapp/.bundle/config b/myapp/.bundle/config deleted file mode 100644 index fc36e026e3..0000000000 --- a/myapp/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ ---- -BUNDLE_BUILD__MYSQL2: "--with-ldflags=-L/usr/local/opt/openssl/lib"