Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 49E02200D11 for ; Mon, 2 Oct 2017 22:39:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 483CF160BCB; Mon, 2 Oct 2017 20:39:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 767C9160BD7 for ; Mon, 2 Oct 2017 22:39:14 +0200 (CEST) Received: (qmail 24298 invoked by uid 500); 2 Oct 2017 20:39:13 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 24077 invoked by uid 99); 2 Oct 2017 20:39:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2017 20:39:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA94DF5746; Mon, 2 Oct 2017 20:39:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlevas@apache.org To: commits@ambari.apache.org Date: Mon, 02 Oct 2017 20:39:13 -0000 Message-Id: <1fd8c7dba2c347e185810d00a2a7777f@git.apache.org> In-Reply-To: <8aa89204483746359bb11d63c56d4f35@git.apache.org> References: <8aa89204483746359bb11d63c56d4f35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] ambari git commit: AMBARI-22055. Make Log Search IT work with the new UI (oleewere) archived-at: Mon, 02 Oct 2017 20:39:15 -0000 AMBARI-22055. Make Log Search IT work with the new UI (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe7a8e4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe7a8e4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe7a8e4b Branch: refs/heads/branch-feature-AMBARI-20859 Commit: fe7a8e4bb681720021c3d4dc60f02ef422aaf3f7 Parents: 6a99bd8 Author: Oliver Szabo Authored: Mon Sep 25 21:09:43 2017 +0200 Committer: Oliver Szabo Committed: Tue Sep 26 13:51:01 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java | 4 +--- .../src/test/resources/stories/selenium/login.ui.story | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fe7a8e4b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java index b40a2bc..1b7c634 100644 --- a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java +++ b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchUISteps.java @@ -22,11 +22,9 @@ import junit.framework.Assert; import org.apache.ambari.logsearch.domain.StoryDataRegistry; import org.apache.ambari.logsearch.web.Home; import org.jbehave.core.annotations.AfterScenario; -import org.jbehave.core.annotations.AfterStories; import org.jbehave.core.annotations.AfterStory; import org.jbehave.core.annotations.BeforeScenario; import org.jbehave.core.annotations.BeforeStories; -import org.jbehave.core.annotations.BeforeStory; import org.jbehave.core.annotations.Given; import org.jbehave.core.annotations.Named; import org.jbehave.core.annotations.Then; @@ -92,7 +90,7 @@ public class LogSearchUISteps extends AbstractLogSearchSteps { LOG.info("Type password: {}", password); home.findElement(By.id("password")).sendKeys(password); LOG.info("Click on Sign In button."); - home.findElement(By.className("custLogin")).click(); + home.findElement(By.cssSelector("login-form > div > form > button")).click(); closeTourPopup(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/fe7a8e4b/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/selenium/login.ui.story ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/selenium/login.ui.story b/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/selenium/login.ui.story index 543c211..4824335 100644 --- a/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/selenium/login.ui.story +++ b/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/selenium/login.ui.story @@ -10,11 +10,11 @@ Scenario: login with admin/admin Given logsearch docker container And open logsearch home page When login with admin / admin -Then page contains text: 'Service Logs' +Then page contains text: 'Refresh' Scenario: login with admin and wrong password Given logsearch docker container And open logsearch home page When login with admin / wrongpassword -Then page does not contain text: 'Service Logs' \ No newline at end of file +Then page does not contain text: 'Refresh' \ No newline at end of file