From 6852ee395973933a2775abdda29f30c944a64221 Mon Sep 17 00:00:00 2001 From: Mahmoud Saad Date: Wed, 21 Dec 2022 21:39:17 +0100 Subject: [PATCH 1/4] changed app text --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index b7f1ff9..51ad5e0 100644 --- a/src/App.js +++ b/src/App.js @@ -4,7 +4,7 @@ function App() { return (
-

I was changed!

+

I was changed on the feature branch

); From 02ce52dce22c83934129cdb89d0994bbb62b9ea2 Mon Sep 17 00:00:00 2001 From: Mahmoud Saad Date: Wed, 21 Dec 2022 21:46:50 +0100 Subject: [PATCH 2/4] modified test --- src/App.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/App.test.js b/src/App.test.js index 54e1bb5..6b21507 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -12,5 +12,7 @@ test("render p element", () => { screen.debug(); - expect(screen.getByText("I was changed!")).toBeInTheDocument(); + expect( + screen.getByText("I was changed on the feature branch") + ).toBeInTheDocument(); }); From b8532f2ebb300e992f19fa90fc16e754844a2a2a Mon Sep 17 00:00:00 2001 From: Mahmoud Saad Date: Wed, 21 Dec 2022 22:25:08 +0100 Subject: [PATCH 3/4] some minor changes --- .dockerignore | 3 +++ src/App.js | 12 +++++++++++- src/App.test.js | 14 +++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..cf2e9d5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +package-lock.json +node_modules +yarn.lock \ No newline at end of file diff --git a/src/App.js b/src/App.js index 51ad5e0..d8cff4e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,20 @@ +import logo from "./logo.svg"; import "./App.css"; function App() { return (
-

I was changed on the feature branch

+ logo +

Bye there!

+ + Learn React +
); diff --git a/src/App.test.js b/src/App.test.js index 6b21507..bc201af 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -1,18 +1,14 @@ import { render, screen } from "@testing-library/react"; import App from "./App"; -/* test("renders learn react link", () => { +test("renders learn react link", () => { render(); const linkElement = screen.getByText(/learn react/i); expect(linkElement).toBeInTheDocument(); -}); */ +}); -test("render p element", () => { +test("renders learn react link", () => { render(); - - screen.debug(); - - expect( - screen.getByText("I was changed on the feature branch") - ).toBeInTheDocument(); + const linkElement = screen.getByText(/learn react/i); + expect(linkElement).toBeInTheDocument(); }); From cdd6beda32902395a913d5edd1420095ea38a57a Mon Sep 17 00:00:00 2001 From: Mahmoud Saad Date: Wed, 21 Dec 2022 23:03:23 +0100 Subject: [PATCH 4/4] improved .travis.yml file --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee47813..2b6cb66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ script: deploy: provider: elasticbeanstalk + access_key_id: &AWS_ACCESS_KEY + secret_access_key: &AWS_SECRET_KEY region: "us-east-1" app: "docker-react" env: "Dockerreact-env" @@ -18,6 +20,4 @@ deploy: bucket_path: "docker-react" on: branch: master - access_key_id: "&AWS_ACCESS_KEY" - secret_access_key: "&AWS_SECRET_KEY" - \ No newline at end of file +