Skip to content

Commit

Permalink
Merge pull request #241 from ably/cypress-test-fixes
Browse files Browse the repository at this point in the history
Cypress test fixes
  • Loading branch information
artismarti authored Dec 2, 2022
2 parents 2234be4 + c3bacca commit e193f50
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ably-ui (8.7.0.dev.28a63f9)
ably-ui (8.7.0.dev.0ce5893)
view_component (>= 2.33, < 2.50)

GEM
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,14 @@ yarn link @ably/ui

For `ruby`:

In `preview/Gemfile` replace `source: "https://rubygems.pkg.github.com/ably"` with `path: '../'` and run:
In `preview/Gemfile` replace the Ably UI gem version number with `path: '../'` like this:

```bash
# in preview
gem 'ably-ui', path: '../', require: 'ably_ui'
```

and run:

```bash
# in preview
Expand Down
7 changes: 4 additions & 3 deletions cypress/integration/core/meganav/parity.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ describe("Panels", () => {
"click"
);

cy.get('[data-id="meganav-mobile-panel-controls"]').within(() => {
cy.contains(name).trigger("click");
});
cy.get(
`[data-id="meganav-control-mobile-panel-open"][aria-controls="${lowercaseName}-panel-mobile"]`
).trigger("click");

cy.get('[data-id="meganav-mobile-dropdown"]');
},
selector: `#${lowercaseName}-panel-mobile`,
Expand Down
2 changes: 1 addition & 1 deletion lib/ably_ui/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module AblyUi
VERSION = '8.7.0.dev.28a63f9'
VERSION = '8.7.0.dev.0ce5893'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ably/ui",
"version": "8.7.0-dev.28a63f9",
"version": "8.7.0-dev.0ce5893",
"description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion preview/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ gem 'view_component', '~> 2.33.0', require: 'view_component/engine'

gem 'responders'

gem 'ably-ui', '8.7.0.dev.28a63f9', require: 'ably_ui'
gem 'ably-ui', '8.7.0.dev.0ce5893', require: 'ably_ui'

# https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias
gem 'psych', '< 4'
Expand Down
4 changes: 2 additions & 2 deletions preview/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
ably-ui (8.7.0.dev.28a63f9)
ably-ui (8.7.0.dev.0ce5893)
view_component (>= 2.33, < 2.50)
actioncable (6.0.5.1)
actionpack (= 6.0.5.1)
Expand Down Expand Up @@ -175,7 +175,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
ably-ui (= 8.7.0.dev.28a63f9)
ably-ui (= 8.7.0.dev.0ce5893)
bootsnap (>= 1.4.2)
byebug
dotenv-rails
Expand Down
2 changes: 1 addition & 1 deletion preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "preview",
"private": true,
"dependencies": {
"@ably/ui": "8.7.0-dev.28a63f9",
"@ably/ui": "8.7.0-dev.0ce5893",
"@babel/preset-react": "^7.12.5",
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "4.3.0",
Expand Down
8 changes: 4 additions & 4 deletions preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@ably/[email protected].28a63f9":
version "8.7.0-dev.28a63f9"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.28a63f9.tgz#132ed10521d64f2c9a820a5954aaa27556594b1a"
integrity sha512-LZX69na3XsHRmjc1mG+f5naFWE+3z/ii/RZHBQSuenH4wKN5bsYvtU9p20t5EcHvRsJYFCFUGQeDj1+lRep45Q==
"@ably/[email protected].0ce5893":
version "8.7.0-dev.0ce5893"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0-dev.0ce5893.tgz#655da6a848a4018001ac0cb60d4a797559469bd5"
integrity sha512-4MJeSSzLFK+diPDdUCyO+rcTnvyJIaxkSdmrHiLJE9lUE58Z7zxSwS3nN3BwPmcyYddWtF63kcFU1tnCaZaZNQ==
dependencies:
addsearch-js-client "^0.7.0"
array-flat-polyfill "^1.0.1"
Expand Down
16 changes: 8 additions & 8 deletions src/core/MeganavContentDevelopers/component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
<% end %>
</li>
<li>
<%= link_to abs_url("/integrations"), class: "ui-meganav-media-with-image group" do %>
<%= render(AblyUi::Core::Icon.new(name: "icon-display-integrations-col", size: "2.5rem")) %>
<%= link_to abs_url("/docs/quick-start-guide"), class: "ui-meganav-media-with-image group" do %>
<%= render(AblyUi::Core::Icon.new(name: "icon-display-quickstart-guides-col", size: "2.5rem")) %>
<div class="flex flex-col justify-center">
<p class="ui-meganav-media-heading">Integrations</p>
<p class="ui-meganav-media-copy">Find out more about Ably integrations. </p>
<p class="ui-meganav-media-heading">Quickstart guides</p>
<p class="ui-meganav-media-copy">Documentation to help you get started quickly.</p>
</div>
<% end %>
</li>
<li>
<%= link_to abs_url("/docs/quick-start-guide"), class: "ui-meganav-media-with-image group" do %>
<%= render(AblyUi::Core::Icon.new(name: "icon-display-quickstart-guides-col", size: "2.5rem")) %>
<%= link_to abs_url("/integrations"), class: "ui-meganav-media-with-image group" do %>
<%= render(AblyUi::Core::Icon.new(name: "icon-display-integrations-col", size: "2.5rem")) %>
<div class="flex flex-col justify-center">
<p class="ui-meganav-media-heading">Quickstart guides</p>
<p class="ui-meganav-media-copy">Documentation to help you get started quickly.</p>
<p class="ui-meganav-media-heading">Integrations</p>
<p class="ui-meganav-media-copy">Find out more about Ably integrations. </p>
</div>
<% end %>
</li>
Expand Down

0 comments on commit e193f50

Please sign in to comment.