Upstream sync

spec/features/admin_managing_accounts_spec.rb

@@ -30,6 +30,24 @@ feature "Admin managing accounts" do
     expect(page).to have_content "Created at less than a minute ago"
   end
 
+  scenario "locks and unlocks account" do
+    sign_in current_user
+    visit admin_signed_in_root_path
+    expect(Account.last.locked?).to eq false
+
+    click_button "Manage"
+    expect(page).not_to have_content "Unlock Account"
+    click_link "Lock Account"
+
+    expect(Account.last.locked?).to eq true
+
+    click_button "Manage"
+    expect(page).not_to have_content "Lock Account"
+    click_link "Unlock Account"
+
+    expect(Account.last.locked?).to eq false
+  end
+
   scenario "sees videos for an account in the system" do
     visit_account_overview_page