Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: multisource support in publisher #236

Merged
merged 17 commits into from
Jan 10, 2023
Merged

feat: multisource support in publisher #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5d90b10
feat: multisource support in publisher
jackshen Jan 9, 2023
db1c550
Merge branch 'int-issue-145-multisources' into issue-147-publisher-ap…
jackshen Jan 9, 2023
345670c
fix: removed console log
jackshen Jan 9, 2023
4e6d0fc
fix: moved statistics popover to portal
jackshen Jan 9, 2023
5688b8c
style: allow overflow and scrolling in settings drawer
jackshen Jan 9, 2023
8849a20
feat: initialise publisher state for new streams
jackshen Jan 9, 2023
8d1b100
test: added back in test id
jackshen Jan 9, 2023
cbdb39c
fix: conditional resolution statistic, readded control bar
jackshen Jan 10, 2023
b646d65
Merge branch 'int-issue-145-multisources' into issue-147-publisher-ap…
jackshen Jan 10, 2023
184694a
test: updated tests
jackshen Jan 10, 2023
f848336
fix: hide resolution for screen share
jackshen Jan 10, 2023
fdb3f59
test: fixed tests
jackshen Jan 10, 2023
8fa847e
test: fixed test
jackshen Jan 10, 2023
3c30a06
test: fixed test
jackshen Jan 10, 2023
51179b8
test: updated undefined test
jackshen Jan 10, 2023
67e6468
test: updated undefined test
jackshen Jan 10, 2023
f9900cd
test: removed deprecated test
jackshen Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const rootMain: StorybookViteConfig = {
resolve: {
alias: {
'@millicast-react/control-bar': path.resolve(__dirname, '../libs/control-bar/src/index.tsx'),
'@millicast-react/device-selection': path.resolve(__dirname, '../libs/device-selection/src/index.ts'),
'@millicast-react/dolbyio-icons': path.resolve(__dirname, '../libs/dolbyio-icons/src/index.ts'),
'@millicast-react/dolbyio-theme': path.resolve(__dirname, '../libs/dolbyio-theme/src/index.ts'),
'@millicast-react/drawer': path.resolve(__dirname, '../libs/drawer/src/index.tsx'),
Expand Down
25 changes: 13 additions & 12 deletions apps/e2e-test/features/publisher-preview.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Feature: Publisher Preview - Not Live
When the publisher clicks on the "add source button"
Then the "share screen button" should be visible
And the "share screen button" should be enabled
And the "add source menu" should contain "Share screen" options
And the "add source menu" should contain "Share screen,Add cameras" options

# Bug/Issue: #200
Scenario: Publisher should be able to share screen before starting the stream
Expand All @@ -89,11 +89,12 @@ Feature: Publisher Preview - Not Live

Then the "screen view" should be displayed
And the "screen view" should be in Normal size
And the "screen view source name" text should be "screen"
And the "screen view source name" text should contain "screen"
And the "screen view setting button" should be displayed
And the "screen view setting button" should be enabled
And the "screen view stop share button" should be displayed
And the "screen view stop share button" should be enabled
# TODO: issue 195
# And the "screen view stop share button" should be displayed
# And the "screen view stop share button" should be enabled
And the "screen view full screen button" should not be displayed

Then the "camera view" should be displayed
Expand All @@ -107,7 +108,6 @@ Feature: Publisher Preview - Not Live
And the "camera view source name" text should contain "fake"
And the "camera view full screen button" should not be displayed

And the "add source button" should not be displayed
# TODO: Bug No #200
# And the "multi source label" should be displayed
# And the "multi source label" text should be "Multisource enabled"
Expand All @@ -118,8 +118,9 @@ Feature: Publisher Preview - Not Live
And the publisher clicks on the "share screen button"
Then the "screen view" should be displayed

When the publisher clicks on the "screen view stop share button"
Then the "screen view" should not be displayed
# TODO: issue 195
# When the publisher clicks on the "screen view stop share button"
# Then the "screen view" should not be displayed

Then the "camera view" should be displayed
And the "camera view" should be in Normal size
Expand All @@ -142,7 +143,7 @@ Feature: Publisher Preview - Not Live
When the publisher clicks on the "camera view setting button"
Then the "camera view settings drawer" should be displayed
Then the "camera view settings drawer title" text should be "Settings"
Then the number of "camera view settings dropdowns" count should be "2"
Then the number of "camera view settings dropdowns" count should be "3"

# TODO: resolution not implemented in setting yet
# Scenario: Publisher should be presented with resolution selection dropdown under settings
Expand Down Expand Up @@ -275,7 +276,6 @@ Feature: Publisher Preview - Not Live
And the "go live button" should be displayed
And the "go live button" should be enabled
And the "go live button" text should be "GO LIVE"
And the "add source button" should not be displayed
And the "invite button" should be displayed
And the "invite button" should be enabled
And the "stream info button" should not be displayed
Expand Down Expand Up @@ -338,9 +338,10 @@ Feature: Publisher Preview - Not Live
And the "screen view" should be in Normal size
And the "screen view setting button" should be displayed
And the "screen view setting button" should be enabled
And the "screen view stop share button" should be displayed
And the "screen view stop share button" should be enabled
And the "screen view source name" text should be "screen"
# TODO: issue 195
# And the "screen view stop share button" should be displayed
# And the "screen view stop share button" should be enabled
And the "screen view source name" text should contain "screen"
And the "screen view full screen button" should not be displayed


Expand Down
Loading