diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss
index f03f66821be1f4be4231dc438fc869e23889a09a..e51ec5d7a3f2d91fd1f962bf33e001980324e915 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss
@@ -11,7 +11,7 @@
overflow-y: auto;
padding-left: var(--md-padding-x);
margin-left: calc(-1 * var(--md-padding-x));
- padding-right: var(--md-padding-x);
+ padding-right: var(--sm-padding-y);
margin-right: calc(-1 * var(--md-padding-x));
padding-bottom: var(--md-padding-x);
margin-bottom: calc(-1 * var(--md-padding-x));
@@ -22,7 +22,7 @@
flex-flow: column;
flex-grow: 1;
flex-shrink: 1;
- margin-right: calc(-1 * var(--md-padding-x));
+ margin-right: auto;
padding-right: var(--md-padding-x);
padding-top: 0;
&:after {
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index 05ceb55db49aebf1c6f4c675e7886ed191003dbf..1b6144dbde844bfb66266e8389268a8289b39034 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -9,7 +9,7 @@
"generate-refs-visual-regression-desktop": "rm -rf tests/webdriverio/screenshots; npm run test-visual-regression-desktop",
"start:prod": "meteor reset && ROOT_URL=http://127.0.0.1/html5client NODE_ENV=production meteor --production",
"start:dev": "ROOT_URL=http://127.0.0.1/html5client NODE_ENV=development meteor",
- "test": "wdio ./tests/webdriverio/wdio.conf.js",
+ "test": "jest",
"lint": "eslint . --ext .jsx,.js",
"precommit": "lint-staged"
},
@@ -70,7 +70,9 @@
"yaml": "^1.0.0"
},
"devDependencies": {
+ "axios": "^0.18.0",
"chai": "~4.1.2",
+ "dotenv": "^6.1.0",
"eslint": "~4.9.0",
"eslint-config-airbnb": "~16.1.0",
"eslint-config-airbnb-base": "~12.1.0",
@@ -78,11 +80,14 @@
"eslint-plugin-jsx-a11y": "~6.0.2",
"eslint-plugin-react": "~7.4.0",
"husky": "~0.14.3",
+ "jest": "^23.6.0",
"lint-staged": "~4.3.0",
"postcss-modules-extract-imports": "1.1.0",
"postcss-modules-local-by-default": "1.2.0",
"postcss-modules-scope": "1.1.0",
"postcss-modules-values": "1.3.0",
+ "puppeteer": "^1.10.0",
+ "sha1": "^1.1.1",
"wdio-jasmine-framework": "~0.3.2",
"wdio-junit-reporter": "~0.4.4",
"wdio-spec-reporter": "~0.1.2",
@@ -105,6 +110,11 @@
"autoprefixer": {}
}
},
+ "jest": {
+ "modulePathIgnorePatterns": [
+ "/tests/webdriverio"
+ ]
+ },
"repository": {
"type": "git",
"url": "https://github.com/bigbluebutton/bigbluebutton.git"
diff --git a/bigbluebutton-html5/tests/puppeteer/README.md b/bigbluebutton-html5/tests/puppeteer/README.md
index 4508a3d46648004b278d8148bb98fe34b439f405..8122661af5e3e242645184a23cb705a5eb3c6150 100644
--- a/bigbluebutton-html5/tests/puppeteer/README.md
+++ b/bigbluebutton-html5/tests/puppeteer/README.md
@@ -11,7 +11,7 @@ To run these tests, you will need the following:
These instructions assume you have the BigBlueButton repository cloned into a directory named `bigbluebutton`.
-First, install the required modules with `npm install`, from this directory. When Puppeteer installs, it will automatically install the Chromium browser in which the tests will run.
+First, you need to have the dependencies installed with `meteor npm install`, from the `bigbluebutton-html5` directory. When Puppeteer installs, it will automatically install the Chromium browser in which the tests will run.
To run individual tests, you can also optionally install Jest globally with `sudo npm install jest -g`.
@@ -34,4 +34,4 @@ The HTML5 client takes a long time to start in the Docker container. The script
## Known Issues
* Hotkeys do not work yet. When hotkeys are pressed, keydown and keyup events are fired, but the click events that would normally be created to press buttons do not occur.
-* Some tests will sometimes fail with a timeout error. Different tests may fail every time the tests are run. This problem affects all tests, and the cause is unknown as of now.
\ No newline at end of file
+* Some tests will sometimes fail with a timeout error. Different tests may fail every time the tests are run. This problem affects all tests, and the cause is unknown as of now.
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 5546cae7210b261a2a568cbdead0a46ca76ccdf0..89464c3d4aeeb51491cd6863cc456a8f0a4310fd 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -1420,10 +1420,12 @@ class ApiController {
UserSession userSession = null;
String respMessage = "Session " + sessionToken + " not found."
- if (meetingService.getUserSessionWithAuthToken(sessionToken) == null) {
+ if (!session[sessionToken]) {
+ reject = true;
+ } else if (meetingService.getUserSessionWithAuthToken(sessionToken) == null) {
reject = true;
respMessage = "Session " + sessionToken + " not found."
- } else {
+ } else {
us = meetingService.getUserSessionWithAuthToken(sessionToken);
meeting = meetingService.getMeeting(us.meetingID);
if (meeting == null || meeting.isForciblyEnded()) {
@@ -1560,7 +1562,9 @@ class ApiController {
println("Session token = [" + sessionToken + "]")
}
- if (meetingService.getUserSessionWithAuthToken(sessionToken) == null)
+ if (!session[sessionToken]) {
+ reject = true;
+ } else if (meetingService.getUserSessionWithAuthToken(sessionToken) == null)
reject = true;
else {
us = meetingService.getUserSessionWithAuthToken(sessionToken);
diff --git a/build_script.sh b/build_script.sh
index a83ccde4eab531a1c81288712d1b5f4129101f64..a66991d71cd4f13b999b288bfef7c8812d6c3a2e 100755
--- a/build_script.sh
+++ b/build_script.sh
@@ -31,11 +31,9 @@ if [[ $files = *"bigbluebutton-html5"* ]]; then
} > /dev/null
cd tests/puppeteer
- npm install
conf=$(docker exec $(docker ps -q) bbb-conf --secret | grep "Secret:")
secret=$(echo $conf | cut -d' ' -f2)
export BBB_SHARED_SECRET=$secret
-
node html5-check.js
npm test
fi