Commit e7c16c98 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'upstream' into merge-upstream

parents 9b92b104 b9b19246

.github/workflows/integration_selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ concurrency: 
  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true

jobs:

  setup-selenium:

    uses: ./.github/workflows/setup_selenium.yaml

  test:

    name: Test

    needs: setup-selenium

    runs-on: ubuntu-latest

    strategy:

      matrix:
@@ -68,7 +71,6 @@ jobs: 
          node-version: '18.12.1'

          cache: 'yarn'

          cache-dependency-path: 'galaxy root/client/yarn.lock'

      - uses: nanasess/setup-chromedriver@v1

      - name: Run tests

        run: ./run_tests.sh --coverage -integration test/integration_selenium

        working-directory: 'galaxy root'

.github/workflows/osx_startup.yaml

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ jobs: 
        with:

          path: .tox

          key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-osx

      - uses: actions/setup-node@v3

        with:

          node-version: '18.12.1'

          cache: 'yarn'

          cache-dependency-path: 'galaxy root/client/yarn.lock'

      - name: Install miniconda  # use this job to test using Python from a conda environment

        uses: conda-incubator/setup-miniconda@v2

        with:

.github/workflows/selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ concurrency: 
  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true

jobs:

  setup-selenium:

    uses: ./.github/workflows/setup_selenium.yaml

  test:

    name: Test

    needs: setup-selenium

    runs-on: ubuntu-latest

    strategy:

      fail-fast: false
@@ -68,7 +71,6 @@ jobs: 
        with:

          path: 'galaxy root/.venv'

          key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-selenium

      - uses: nanasess/setup-chromedriver@v1

      - name: Run tests

        run: ./run_tests.sh --coverage -selenium lib/galaxy_test/selenium -- --num-shards=3 --shard-id=${{ matrix.chunk }}

        working-directory: 'galaxy root'

.github/workflows/setup_selenium.yaml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
on:

  workflow_call:

jobs:

  setup_chromedriver:

    runs-on: ubuntu-latest

    steps:

      - name: Install chromedriver

        uses: mvdbeek/setup-chromedriver@chromedriver_puppeteer

client/src/components/Common/ContextMenu.vue

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ watch( 


<template>

    <div v-if="visible">

        <Popper placement="right" class="context-menu" :style="placeContextMenu" :forceShow="true" :dark-mode="false">

        <Popper placement="right" class="context-menu" :style="placeContextMenu" :force-show="true" :dark-mode="false">

            <div class="context-menu-slot">

                <slot />

            </div>