From e3f492e13a3c75c2d80a7c8a62a7a72ec24e2477 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@icloud.com>
Date: Thu, 7 Jul 2022 13:29:58 -0700
Subject: [PATCH] Hoisted assert clipboard into TestAppContext

---
 crates/editor/src/editor.rs        | 2 +-
 crates/editor/src/test.rs          | 8 --------
 crates/gpui/src/app.rs             | 8 ++++++++
 crates/vim/src/vim_test_context.rs | 8 --------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c1e2557555..808926ff50 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8232,7 +8232,7 @@ mod tests {
             fox ju|mps over
             the lazy dog"});
         cx.update_editor(|e, cx| e.copy(&Copy, cx));
-        cx.assert_clipboard_content(Some("fox jumps over\n"));
+        cx.cx.assert_clipboard_content(Some("fox jumps over\n"));
 
         // Paste with three selections, noticing how the copied full-line selection is inserted
         // before the empty selections but replaces the selection that is non-empty.
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index d1316a85a0..0affe06f64 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -404,14 +404,6 @@ impl<'a> EditorTestContext<'a> {
 
         editor_text_with_selections
     }
-
-    pub fn assert_clipboard_content(&mut self, expected_content: Option<&str>) {
-        self.cx.update(|cx| {
-            let actual_content = cx.read_from_clipboard().map(|item| item.text().to_owned());
-            let expected_content = expected_content.map(|content| content.to_owned());
-            assert_eq!(actual_content, expected_content);
-        })
-    }
 }
 
 impl<'a> Deref for EditorTestContext<'a> {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index b81714e0bc..26c4fe01a8 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -627,6 +627,14 @@ impl TestAppContext {
             }
         })
     }
+
+    pub fn assert_clipboard_content(&mut self, expected_content: Option<&str>) {
+        self.update(|cx| {
+            let actual_content = cx.read_from_clipboard().map(|item| item.text().to_owned());
+            let expected_content = expected_content.map(|content| content.to_owned());
+            assert_eq!(actual_content, expected_content);
+        })
+    }
 }
 
 impl AsyncAppContext {
diff --git a/crates/vim/src/vim_test_context.rs b/crates/vim/src/vim_test_context.rs
index 57d0174703..08ec4bd5e9 100644
--- a/crates/vim/src/vim_test_context.rs
+++ b/crates/vim/src/vim_test_context.rs
@@ -147,14 +147,6 @@ impl<'a> VimTestContext<'a> {
         let mode = self.mode();
         VimBindingTestContext::new(keystrokes, mode, mode, self)
     }
-
-    pub fn assert_clipboard_content(&mut self, expected_content: Option<&str>) {
-        self.cx.update(|cx| {
-            let actual_content = cx.read_from_clipboard().map(|item| item.text().to_owned());
-            let expected_content = expected_content.map(|content| content.to_owned());
-            assert_eq!(actual_content, expected_content);
-        })
-    }
 }
 
 impl<'a> Deref for VimTestContext<'a> {