Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolve conflict

  • Loading branch information...
commit f93ca2d35db1cb25622fcf588b20e569a2589d6a 1 parent c441901
@weissjeffm weissjeffm authored
Showing with 3 additions and 2 deletions.
  1. +2 −2 src/katello/locators.clj
  2. +1 −0  src/katello/setup.clj
View
4 src/katello/locators.clj
@@ -100,7 +100,7 @@
})
(def all-tabs (tabs [:organizations
- :administer
+ :administration
:systems
:content-management
:dashboard
@@ -446,7 +446,7 @@
[:named-organization-page [org-name] (choose-left-pane (left-pane-item org-name))
[:new-environment-page [] (browser click :new-environment)]
[:named-environment-page [env-name] (browser click (environment-link env-name))]]]
- [:administer-tab [] (browser mouseOver :administer)
+ [:administration-tab [] (browser mouseOver :administration)
[:users-tab [] (browser clickAndWait :users)
[:named-user-page [username] (choose-left-pane (user username))
[:user-environments-page [] (browser click :environments-subsubtab)]
View
1  src/katello/setup.clj
@@ -59,6 +59,7 @@
(@config :client-ssh-key)
(@config :client-ssh-key-passphrase))
(catch Exception e (do (.printStackTrace e) e))))]
+
(start-selenium)
(switch-new-admin-user *session-user* *session-password*)
(consume-fn)
Please sign in to comment.
Something went wrong with that request. Please try again.