From 6fade2d4745b67bcf09ac1cb59f8cc35dfad5294 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Thu, 4 Jun 2020 14:26:21 -0600
Subject: [PATCH 1/2] handle data-test-subj in testenv mock

---
 src/components/code/_code_block.testenv.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/code/_code_block.testenv.tsx b/src/components/code/_code_block.testenv.tsx
index b1480600eb5..0b7903a902e 100644
--- a/src/components/code/_code_block.testenv.tsx
+++ b/src/components/code/_code_block.testenv.tsx
@@ -18,8 +18,12 @@
  */
 
 import React from 'react';
-export const EuiCodeBlockImpl = ({ children, inline }: any) => {
-  const snippet = <code>{children}</code>;
+export const EuiCodeBlockImpl = ({
+  children,
+  inline,
+  'data-test-subj': dataTestSubj,
+}: any) => {
+  const snippet = <code data-test-subj={dataTestSubj}>{children}</code>;
   return inline ? (
     <span>{snippet}</span>
   ) : (

From 50edc605becfdb263bb7fb9992a093803d4c22d1 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Fri, 5 Jun 2020 12:00:44 -0600
Subject: [PATCH 2/2] CL

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8cad06ba93..c78669d6f07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-No public interface changes since `25.0.0`.
+**Bug fixes**
+
+- Fixed `EuiCodeBlockImpl` testenv mock pass-through of `data-test-subj` attribute ([#3560](https://github.com/elastic/eui/pull/3560))
 
 ## [`25.0.0`](https://github.com/elastic/eui/tree/v25.0.0)