Fixes user update

app/controllers/admin/users_controller.rb

@@ -1,6 +1,7 @@
 class Admin::UsersController < Admin::BaseController
   def index
     @users = User.unscoped.all
+
   end
 
   def show
@@ -26,9 +27,23 @@ def update
 
   def update_role
     @user = User.find(params[:user_id])
-    @user.update(user_role_params)
-    flash[:success] = "The user role has been updated to #{@user.role}."
-    redirect_to admin_dash_users_path
+    @merchant = Merchant.where(name: params[:user][:merchant]).first
+      if params[:user][:role] == "merchant_employee" && @merchant
+        @user.update(user_role_params)
+        @user.merchant_id = @merchant.id
+        @user.save
+      elsif params[:user][:role] != "merchant_employee" && @user.merchant_id != nil
+        @user.update(user_role_params)
+        @user.merchant_id = nil
+        @user.save
+      end
+    if @user.update
+      flash[:success] = "The user role has been updated to #{@user.role}."
+      redirect_to admin_dash_users_path
+    else
+      flash[:error] = "Please try again. You may need to choose a merchant."
+      redirect_to admin_dash_users_path
+    end
   end
 
   def toggle_active

app/views/admin/users/_role.html.erb

@@ -3,7 +3,11 @@
 <center>
 <%= form_for [:admin, user], url: "/admin/users/#{user.id}/role", :html => { :style => 'background-color: #17BEBB;' } do |f| %>
   <%= f.label :role%>
-  <%= f.select :role, ['user', 'merchant_employee', 'merchant_admin', 'admin_user']%>
+  <%= f.select :role, ['user', 'merchant_employee', 'admin_user']%>
+
+  <%= f.label :merchant %>
+  <%= f.select :merchant, Merchant.all.map {|merchant| [merchant.name]}, :prompt => 'Select a Merchant'%>
+
   <%= f.submit %>
 <% end %>
 </center>

spec/features/admin/user/updates_role_status.rb

@@ -6,7 +6,7 @@
     user = create(:random_user)
     user_2 = create(:random_user)
     user_3 = create(:random_user)
-
+    merchant = create(:ray_merchant)
     allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(admin)
 
     visit admin_dash_users_path
@@ -15,12 +15,58 @@
 
     within "#user-#{user.id}" do
       expect(page).to have_content('Role')
-      select "merchant_admin", :from => "Role"
+      select "merchant_employee", :from => "Role"
+      select("Vintage Vampire", from: "Merchant").select_option
       click_on "Update"
+    end
+
+    user.reload
+    expect(user.role).to eq("merchant_employee")
+    expect(user.merchant_id).to eq(merchant.id)
+    expect(page).to have_content("The user role has been updated to #{user.role}.")
+  end
+
+  it "won't update a merchant id if its not a merchant employee" do
+    admin = create(:admin_user)
+    user = create(:merchant_employee)
+    merchant = create(:ray_merchant)
+    allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(admin)
+
+    visit admin_dash_users_path
+
+    expect(user.role).to eq("merchant_employee")
 
+    within "#user-#{user.id}" do
+      select "user", :from => "Role"
+      select("Vintage Vampire", from: "Merchant").select_option
+      click_on "Update"
     end
+
     user.reload
-    expect(user.role).to eq("merchant_admin")
+    expect(user.role).to eq("user")
+    expect(user.merchant_id).to eq(nil)
     expect(page).to have_content("The user role has been updated to #{user.role}.")
   end
+
+  it "won't update if no merchant is given for a merchant employee" do
+    admin = create(:admin_user)
+    user = create(:random_user)
+    merchant = create(:ray_merchant)
+    allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(admin)
+
+    visit admin_dash_users_path
+
+    expect(user.role).to eq("user")
+
+    within "#user-#{user.id}" do
+      select "merchant_employee", :from => "Role"
+      click_on "Update"
+    end
+
+    user.reload
+    expect(user.role).to eq("user")
+    expect(user.merchant_id).to eq(nil)
+save_and_open_page
+    expect(page).to have_content("Please try again. You may need to choose a merchant.")
+  end
 end