You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/02 20:39:13 UTC
[02/50] [abbrv] ambari git commit: AMBARI-22055. Make Log Search IT
work with the new UI (oleewere)
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 <ol...@gmail.com>
Authored: Mon Sep 25 21:09:43 2017 +0200
Committer: Oliver Szabo <ol...@gmail.com>
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