chore: resolving merge conflict bw develop and ct

.github/workflows/jira-issue-sync.yml

@@ -0,0 +1,54 @@
+name: Create Internal Issue on Jira from Issue
+
+on:
+  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#issues
+  # https://docs.github.com/en/developers/webhooks-and-events/webhook-events-and-payloads#issues
+  issues:
+    types: [labeled]
+
+jobs:
+  create-jira-issue-from-labeled-issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log label
+        if: github.event.label.name != 'internal-priority'
+        run: echo Label is ${{ github.event.label.name }} - skipping next steps
+
+      # https://github.com/atlassian/gajira-login
+      - name: Jira login
+        id: login
+        if: github.event.label.name == 'internal-priority'
+        uses: atlassian/gajira-login@master
+        env:
+          JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+          JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+          JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+
+      # https://github.com/atlassian/gajira-create
+      - name: Create TR Jira issue for internal-priority labels
+        id: create_jira_internal_priority_issue
+        if: github.event.label.name == 'internal-priority'
+        uses: atlassian/gajira-create@master
+        with:
+          project: TR
+          issuetype: Bug
+          summary: |
+            ${{ github.event.issue.title }}
+          description: |
+            Created via GitHub Action with 'internal-priority' label.
+          # Find all available fields JIRA_BASE_URL/rest/api/3/field
+          fields: '{"customfield_10032": "${{ github.event.issue.html_url }}"}'
+
+      # https://github.com/actions/github-script
+      - name: Add comment to GitHub issue
+        if: github.event.label.name == 'internal-priority'
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Internal Jira issue: [${{ steps.create_jira_internal_priority_issue.outputs.issue }}](${{ secrets.JIRA_BASE_URL }}/browse/${{ steps.create_jira_internal_priority_issue.outputs.issue }})'
+            }) 

.github/workflows/jira-pr-sync.yml

@@ -0,0 +1,55 @@
+name: Create Internal Issue on Jira from PR
+
+on:
+  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request
+  # https://docs.github.com/en/developers/webhooks-and-events/webhook-events-and-payloads#pull_request
+  pull_request:
+    types: [labeled]
+
+jobs:
+  create-jira-issue-from-labeled-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log label
+        if: github.event.label.name != 'internal-priority'
+        run: echo Label is ${{ github.event.label.name }} - skipping next steps
+
+      # https://github.com/atlassian/gajira-login
+      - name: Jira login
+        id: login
+        if: github.event.label.name == 'internal-priority'
+        uses: atlassian/gajira-login@master
+        env:
+          JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+          JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+          JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+
+      # https://github.com/atlassian/gajira-create
+      - name: Create TR Jira issue for internal-priority labels
+        id: create_jira_internal_priority_issue
+        if: github.event.label.name == 'internal-priority'
+        uses: atlassian/gajira-create@master
+        with:
+          project: TR
+          issuetype: Bug
+          summary: |
+            ${{ github.event.pull_request.title }}
+          description: |
+            Created via GitHub Action with 'internal-priority' label.
+          # Find all available fields JIRA_BASE_URL/rest/api/3/field
+          fields: '{"customfield_10032": "${{ github.event.pull_request.html_url }}"}'
+
+
+      # https://github.com/actions/github-script
+      - name: Add comment to GitHub PR
+        if: github.event.label.name == 'internal-priority'
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.issues.createComment({
+              issue_number: context.payload.pull_request.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Internal Jira issue: [${{ steps.create_jira_internal_priority_issue.outputs.issue }}](${{ secrets.JIRA_BASE_URL }}/browse/${{ steps.create_jira_internal_priority_issue.outputs.issue }})'
+            }) 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "Cypress.io end to end testing tool",
   "private": true,
   "scripts": {

packages/desktop-gui/cypress/integration/footer_spec.js

@@ -33,7 +33,7 @@ describe('Footer', () => {
 
     it('opens link to changelog on click of changelog', () => {
       cy.contains('button', 'Changelog').click().then(() => {
-        expect(ipc.externalOpen).to.be.calledWith('https://on.cypress.io/changelog?source=dgui_footer')
+        expect(ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/changelog' })
       })
     })
 

packages/desktop-gui/cypress/integration/login_spec.js

@@ -73,7 +73,8 @@ describe('Login', function () {
 
       it('passes utm code when it triggers ipc "begin:auth"', function () {
         cy.then(function () {
-          expect(this.ipc.beginAuth).to.be.calledWith('Nav Login Button')
+          // we match nav in this test since the outer beforeEach initializes the modal from the navbar
+          expect(this.ipc.beginAuth).to.be.calledWith('Nav')
         })
       })
 

packages/desktop-gui/cypress/integration/nav_spec.js

@@ -25,13 +25,13 @@ describe('Navigation', function () {
 
   it('displays and opens link to docs on click', () => {
     cy.get('nav').find('.fa-graduation-cap').click().then(function () {
-      expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io')
+      expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/docs' })
     })
   })
 
   it('displays and opens link to support on click', () => {
     cy.get('nav').find('.fa-question-circle').click().then(function () {
-      expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/support')
+      expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/support' })
     })
   })
 

packages/desktop-gui/cypress/integration/runs_list_spec.js

@@ -317,7 +317,7 @@ describe('Runs List', function () {
 
     it('clicking Log In to Dashboard passes utm code', () => {
       cy.contains('button', 'Log In to Dashboard').click().then(function () {
-        expect(this.ipc.beginAuth).to.be.calledWith('Runs Tab Login Button')
+        expect(this.ipc.beginAuth).to.be.calledWith('Runs Tab')
       })
     })
   })

packages/desktop-gui/cypress/integration/settings_spec.js

@@ -222,7 +222,7 @@ describe('Settings', () => {
 
       it('opens help link on click', () => {
         cy.get('.settings-config .learn-more').click().then(function () {
-          expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/guides/configuration')
+          expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/guides/configuration' })
         })
       })
 
@@ -413,7 +413,7 @@ describe('Settings', () => {
 
       it('opens ci guide when learn more is clicked', () => {
         cy.get('.settings-record-key').contains('Learn more').click().then(function () {
-          expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/what-is-a-record-key')
+          expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/what-is-a-record-key' })
         })
       })
 
@@ -606,7 +606,7 @@ describe('Settings', () => {
 
     it('opens help link on click', () => {
       cy.get('.settings-proxy .learn-more').click().then(function () {
-        expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/proxy-configuration')
+        expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/proxy-configuration' })
       })
     })
 
@@ -697,7 +697,7 @@ describe('Settings', () => {
       const hasLearnMoreLink = () => {
         cy.get('[data-cy=experiments]').contains('a', 'Learn more').click()
         .then(function () {
-          expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/experiments')
+          expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/experiments' })
         })
       }
 
@@ -785,7 +785,7 @@ describe('Settings', () => {
 
     it('opens file preference guide when learn more is clicked', () => {
       cy.get('.file-preference').contains('Learn more').click().then(function () {
-        expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/file-opener-preference')
+        expect(this.ipc.externalOpen).to.be.calledWithMatch({ url: 'https://on.cypress.io/file-opener-preference' })
       })
     })
 

packages/desktop-gui/src/app/nav.jsx

@@ -24,12 +24,12 @@ export default class Nav extends Component {
         <ul className='nav'>
           <li>
             <a onClick={this._openSupport} href='#'>
-              <i className='fas fa-question-circle'></i> Support
+              <i className='fas fa-question-circle' /> Support
             </a>
           </li>
           <li>
             <a onClick={this._openDocs} href='#'>
-              <i className='fas fa-graduation-cap'></i> Docs
+              <i className='fas fa-graduation-cap' /> Docs
             </a>
           </li>
           {this._userStateButton()}
@@ -50,15 +50,15 @@ export default class Nav extends Component {
     if (appStore.isGlobalMode && project) {
       return (
         <Link to={routes.intro()}>
-          <i className='fas fa-chevron-left'></i> Back
+          <i className='fas fa-chevron-left' /> Back
         </Link>
       )
     }
 
     // global mode, on intro page
     return (
       <div className='logo'>
-        <img src={require('@cypress/icons/dist/logo/cypress-inverse.png')} />
+        <img src={require('@cypress/icons/dist/logo/cypress-inverse.png')} alt="Cypress" />
       </div>
     )
   }
@@ -113,7 +113,7 @@ export default class Nav extends Component {
 
     return (
       <span>
-        <i className='fas fa-sign-out-alt'></i>{' '}
+        <i className='fas fa-sign-out-alt' />{' '}
         Log Out
       </span>
     )
@@ -126,16 +126,28 @@ export default class Nav extends Component {
   }
 
   _showLogin () {
-    authStore.openLogin()
+    authStore.openLogin(null, 'Nav')
   }
 
   _openDocs (e) {
     e.preventDefault()
-    ipc.externalOpen('https://on.cypress.io')
+    ipc.externalOpen({
+      url: 'https://on.cypress.io/docs',
+      params: {
+        utm_medium: 'Nav',
+        utm_campaign: 'Docs',
+      },
+    })
   }
 
   _openSupport (e) {
     e.preventDefault()
-    ipc.externalOpen('https://on.cypress.io/support')
+    ipc.externalOpen({
+      url: 'https://on.cypress.io/support',
+      params: {
+        utm_medium: 'Nav',
+        utm_campaign: 'Support',
+      },
+    })
   }
 }

packages/desktop-gui/src/auth/auth-store.js

@@ -4,6 +4,7 @@ import User from '../lib/user-model'
 class AuthStore {
   @observable isLoading = true
   @observable isShowingLogin = false
+  @observable loginUTM = null
   @observable user = null
   @observable message = null
 
@@ -19,11 +20,12 @@ class AuthStore {
     this.message = message
   }
 
-  @action openLogin (onCloseCb) {
+  @action openLogin (onCloseCb, loginUTM = null) {
     this.onCloseCb = onCloseCb
 
     this.setMessage(null)
     this.isShowingLogin = true
+    this.loginUTM = loginUTM
   }
 
   @action closeLogin () {
@@ -33,6 +35,7 @@ class AuthStore {
 
     this.setMessage(null)
     this.isShowingLogin = false
+    this.loginUTM = false
   }
 
   @action setUser (user) {

packages/desktop-gui/src/auth/login-form.jsx

@@ -61,15 +61,15 @@ class LoginForm extends Component {
       if (message && message.name === 'AUTH_COULD_NOT_LAUNCH_BROWSER') {
         return (
           <span>
-            <i className='fas fa-exclamation-triangle'></i>{' '}
+            <i className='fas fa-exclamation-triangle' />{' '}
             Could not open browser.
           </span>
         )
       }
 
       return (
         <span>
-          <i className='fas fa-spinner fa-spin'></i>{' '}
+          <i className='fas fa-spinner fa-spin' />{' '}
           {message && message.browserOpened ? 'Waiting for browser login...' : 'Opening browser...'}
         </span>
       )
@@ -90,7 +90,7 @@ class LoginForm extends Component {
     return (
       <div className='alert alert-danger'>
         <p>
-          <i className='fas fa-exclamation-triangle'></i>{' '}
+          <i className='fas fa-exclamation-triangle' />{' '}
           <strong>Can't Log In</strong>
         </p>
         <p>{this._errorMessage(error.message)}</p>

packages/desktop-gui/src/auth/login-modal.jsx

@@ -68,9 +68,9 @@ class LoginContent extends Component {
     return (
       <div className='modal-body login'>
         <BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
-        <h1><i className='fas fa-lock'></i> Log In</h1>
+        <h1><i className='fas fa-lock' /> Log In</h1>
         <p>Logging in gives you access to the <a onClick={this._openDashboard}>Cypress Dashboard Service</a>. You can set up projects to be recorded and see test data from your project.</p>
-        <LoginForm utm='Nav Login Button' onSuccess={() => this.setState({ succeeded: true })} />
+        <LoginForm utm={authStore.loginUTM} onSuccess={() => this.setState({ succeeded: true })} />
       </div>
     )
   }
@@ -79,7 +79,7 @@ class LoginContent extends Component {
     return (
       <div className='modal-body login'>
         <BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
-        <h1><i className='fas fa-check'></i> Login Successful</h1>
+        <h1><i className='fas fa-check' /> Login Successful</h1>
         <p>You are now logged in{authStore.user ? ` as ${authStore.user.displayName}` : ''}.</p>
         {
           !authStore.user.name ?
@@ -102,14 +102,14 @@ class LoginContent extends Component {
     return (
       <div className='modal-body login login-no-api-server'>
         <BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
-        <h4><i className='fas fa-wifi'></i> Cannot connect to API server</h4>
+        <h4><i className='fas fa-wifi' /> Cannot connect to API server</h4>
         <p>Logging in requires connecting to an external API server. We tried but failed to connect to the API server at <em>{this.state.apiUrl}</em></p>
         <p>
           <button
             className='btn btn-default btn-sm'
             onClick={this._pingApiServer}
           >
-            <i className='fas fa-sync-alt'></i>{' '}
+            <i className='fas fa-sync-alt' />{' '}
             Try again
           </button>
         </p>

packages/desktop-gui/src/footer/footer.jsx

@@ -14,7 +14,14 @@ import UpdateNotice from '../update/update-notice'
 const openChangelog = (e) => {
   e.target.blur()
 
-  ipc.externalOpen('https://on.cypress.io/changelog?source=dgui_footer')
+  ipc.externalOpen({
+    url: 'https://on.cypress.io/changelog',
+    params: {
+      source: 'dgui_footer',
+      utm_medium: 'Footer',
+      utm_campaign: 'Changelog',
+    },
+  })
 }
 
 const Footer = observer(() => {