Merge pull request #3018 from fjordllc/feature/select-course-in-signup

サインアップ時にURLでコースを指定できるようにした

app/controllers/users_controller.rb

@@ -42,13 +42,13 @@ def new
     when 'trainee'
       @user.trainee = true
     end
+    @user.course_id = params[:course_id]
     @user.company_id = params[:company_id]
   end
 
   def create
     @user = User.new(user_params)
-    @user.course = Course.first
-
+    @user.course_id ||= Course.first.id
     @user.free = true if @user.trainee?
 
     if @user.staff? || @user.trainee?

app/views/users/_form.html.slim

@@ -4,6 +4,7 @@
   = f.hidden_field :adviser
   = f.hidden_field :trainee
   = f.hidden_field :company_id
+  = f.hidden_field :course_id
   = hidden_field_tag :idempotency_token, SecureRandom.uuid
   = render 'errors', object: user
   .form__items
@@ -20,7 +21,6 @@
     = render 'users/form/description', f: f, user: user
     = render 'users/form/tags', f: f, user: user
     - unless user.adviser?
-      = render 'users/form/course', f: f
       = render 'users/form/job', f: f
       = render 'users/form/os', f: f
       = render 'users/form/prefecture', f: f

test/system/sign_up_test.rb

@@ -187,6 +187,28 @@ class SignUpTest < ApplicationSystemTestCase
     assert_equal User.find_by(email: email).company_id, companies(:company2).id
   end
 
+  test 'sign up as trainee with course_id' do
+    course = courses(:course2)
+    visit "/users/new?role=trainee&course_id=#{course.id}"
+
+    email = 'fuyuko@example.com'
+
+    within 'form[name=user]' do
+      fill_in 'user[login_name]', with: 'foo'
+      fill_in 'user[email]', with: email
+      fill_in 'user[name]', with: 'テスト ふゆこ'
+      fill_in 'user[name_kana]', with: 'テスト フユコ'
+      fill_in 'user[description]', with: 'テストふゆこです。'
+      fill_in 'user[password]', with: 'testtest'
+      fill_in 'user[password_confirmation]', with: 'testtest'
+      select '学生', from: 'user[job]'
+      select 'Mac(Intel)', from: 'user[os]'
+      select '未経験', from: 'user[experience]'
+    end
+    click_button '利用規約に同意して参加する'
+    assert_equal User.find_by(email: email).course_id, course.id
+  end
+
   test 'sign up with empty description ' do
     visit '/users/new'
     within 'form[name=user]' do