emails: move edit email flow to emails controller.

test/functional/emails_controller_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+class EmailsControllerTest < ActionDispatch::IntegrationTest
+  context "in all cases" do
+    setup do
+      @user = create(:user, email_address: build(:email_address, { address: "bob@ogres.net" }))
+    end
+
+    context "#edit" do
+      should "render" do
+        get_auth edit_user_email_path(@user), @user
+        assert_response :success
+      end
+    end
+
+    context "#create" do
+      context "with the correct password" do
+        should "work" do
+          put_auth user_email_path(@user), @user, params: { user: { password: "password", email: "abc@ogres.net" }}
+
+          assert_redirected_to(settings_path)
+          assert_equal("abc@ogres.net", @user.reload.email_address.address)
+        end
+      end
+
+      context "with the incorrect password" do
+        should "not work" do
+          put_auth user_email_path(@user), @user, params: { user: { password: "passwordx", email: "abc@ogres.net" }}
+
+          assert_response :success
+          assert_equal("bob@ogres.net", @user.reload.email_address.address)
+        end
+      end
+    end
+  end
+end

test/functional/maintenance/user/email_changes_controller_test.rb

@@ -1,37 +0,0 @@
-require "test_helper"
-
-module Maintenance
-  module User
-    class EmailChangesControllerTest < ActionDispatch::IntegrationTest
-      context "in all cases" do
-        setup do
-          @user = create(:user, email_address: build(:email_address, { address: "bob@ogres.net" }))
-        end
-
-        context "#new" do
-          should "render" do
-            get_auth new_maintenance_user_email_change_path, @user
-            assert_response :success
-          end
-        end
-
-        context "#create" do
-          context "with the correct password" do
-            should "work" do
-              post_auth maintenance_user_email_change_path, @user, params: {:email_change => {:password => "password", :email => "abc@ogres.net"}}
-              assert_redirected_to(edit_user_path(@user))
-              assert_equal("abc@ogres.net", @user.reload.email_address.address)
-            end
-          end
-
-          context "with the incorrect password" do
-            should "not work" do
-              post_auth maintenance_user_email_change_path, @user, params: {:email_change => {:password => "passwordx", :email => "abc@ogres.net"}}
-              assert_equal("bob@ogres.net", @user.reload.email_address.address)
-            end
-          end
-        end
-      end
-    end
-  end
-end