Test when there are zero limits

5 files changed, 33 insertions, 7 deletions

diff --git a/deps/rabbitmq_management/selenium/test/definitions/Makefile b/deps/rabbitmq_management/selenium/test/definitions/Makefile
index b7fb1339f9..84446d1c12 100644
--- a/deps/rabbitmq_management/selenium/test/definitions/Makefile
+++ b/deps/rabbitmq_management/selenium/test/definitions/Makefile
@@ -10,5 +10,11 @@ RABBITMQ_SERVER_ROOT = ../../../../../
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
+start-rabbitmq: ## Start RabbitMQ
+	@(docker kill rabbitmq >/dev/null 2>&1  && docker rm rabbitmq)
+	@(gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
+		RABBITMQ_ENABLED_PLUGINS="rabbitmq_management" \
+		RABBITMQ_CONFIG_FILE=deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.config)
+
 test: ## Run tests interactively e.g. make test [TEST=landing.js]
 	@(RABBITMQ_URL=http://localhost:15672 RUN_LOCAL=true SCREENSHOTS_DIR=${PWD}/../../screens npm test $(PWD)/$(TEST))
diff --git a/deps/rabbitmq_management/selenium/test/limits/Makefile b/deps/rabbitmq_management/selenium/test/limits/Makefile
index b7fb1339f9..84446d1c12 100644
--- a/deps/rabbitmq_management/selenium/test/limits/Makefile
+++ b/deps/rabbitmq_management/selenium/test/limits/Makefile
@@ -10,5 +10,11 @@ RABBITMQ_SERVER_ROOT = ../../../../../
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
+start-rabbitmq: ## Start RabbitMQ
+	@(docker kill rabbitmq >/dev/null 2>&1  && docker rm rabbitmq)
+	@(gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
+		RABBITMQ_ENABLED_PLUGINS="rabbitmq_management" \
+		RABBITMQ_CONFIG_FILE=deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.config)
+
 test: ## Run tests interactively e.g. make test [TEST=landing.js]
 	@(RABBITMQ_URL=http://localhost:15672 RUN_LOCAL=true SCREENSHOTS_DIR=${PWD}/../../screens npm test $(PWD)/$(TEST))
diff --git a/deps/rabbitmq_management/selenium/test/limits/users.js b/deps/rabbitmq_management/selenium/test/limits/users.js
index 41ef3ac428..046145df54 100644
--- a/deps/rabbitmq_management/selenium/test/limits/users.js
+++ b/deps/rabbitmq_management/selenium/test/limits/users.js
@@ -8,7 +8,7 @@ const OverviewPage = require('../pageobjects/OverviewPage')
 const AdminTab = require('../pageobjects/AdminTab')
 const LimitsAdminTab = require('../pageobjects/LimitsAdminTab')
 
-describe('List all user_limits', function () {
+describe('user_limits', function () {
   let login
   let overview
   let captureScreen
@@ -32,9 +32,7 @@ describe('List all user_limits', function () {
   it('when there are no limits', async function () {
     await overview.clickOnAdminTab()
     await adminTab.clickOnLimits()
-
-    await limitsSection.list_user_limits()
-
+    assert.equal(0, (await limitsSection.list_user_limits()).length)
   })
 
 
diff --git a/deps/rabbitmq_management/selenium/test/limits/virtual-hosts.js b/deps/rabbitmq_management/selenium/test/limits/virtual-hosts.js
index dd5a76d66d..5f42751427 100644
--- a/deps/rabbitmq_management/selenium/test/limits/virtual-hosts.js
+++ b/deps/rabbitmq_management/selenium/test/limits/virtual-hosts.js
@@ -8,7 +8,7 @@ const OverviewPage = require('../pageobjects/OverviewPage')
 const AdminTab = require('../pageobjects/AdminTab')
 const LimitsAdminTab = require('../pageobjects/LimitsAdminTab')
 
-describe('List all virtual_host_limits', function () {
+describe('virtual_host_limits', function () {
   let login
   let overview
   let captureScreen
@@ -32,9 +32,8 @@ describe('List all virtual_host_limits', function () {
   it('when there are no limits', async function () {
     await overview.clickOnAdminTab()
     await adminTab.clickOnLimits()
+    assert.equal(0, (await limitsSection.list_virtual_host_limits()).length)
 
-    await limitsSection.list_virtual_host_limits()
-    
   })
 
 
diff --git a/deps/rabbitmq_management/selenium/test/pageobjects/LimitsAdminTab.js b/deps/rabbitmq_management/selenium/test/pageobjects/LimitsAdminTab.js
index 923e4d4820..590b6b3f1c 100644
--- a/deps/rabbitmq_management/selenium/test/pageobjects/LimitsAdminTab.js
+++ b/deps/rabbitmq_management/selenium/test/pageobjects/LimitsAdminTab.js
@@ -7,6 +7,9 @@ const SELECTED_LIMITS_ON_RHM = By.css('div#rhs ul li a[href="#/limits"]')
 const VIRTUAL_HOST_LIMITS_SECTION = By.css('div#main div#virtual-host-limits')
 const USER_LIMITS_SECTION = By.css('div#main div#user-limits')
 
+const VIRTUAL_HOST_LIMITS_TABLE_ROWS = By.css('div#main div#virtual-host-limits table.list tbody tr')
+const USER_LIMITS_TABLE_ROWS = By.css('div#main div#user-limits table.list tbody tr')
+
 module.exports = class LimitsAdminTab extends AdminTab {
   async isLoaded () {
     await this.waitForDisplayed(SELECTED_LIMITS_ON_RHM)
@@ -14,9 +17,23 @@ module.exports = class LimitsAdminTab extends AdminTab {
 
   async list_virtual_host_limits() {
     await this.click(VIRTUAL_HOST_LIMITS_SECTION)
+    try
+    {
+      rows = driver.findElements(VIRTUAL_HOST_LIMITS_TABLE_ROWS)
+      return rows
+    } catch (NoSuchElement) {
+      return Promise.resolve([])
+    }
   }
   async list_user_limits() {
     await this.click(USER_LIMITS_SECTION)
+    try
+    {
+      rows = driver.findElements(VIRTUAL_HOST_LIMITS_TABLE_ROWS)
+      return rows
+    } catch (NoSuchElement) {
+      return Promise.resolve([])
+    }
   }
 
 }