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.

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

Od/chore/casing for git provider #2901

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: change all UI rendered gitlabs to GitLab
  • Loading branch information
sashaboi committed May 27, 2024
commit 964c3328cfb1063d2392b14e2abf3962df57380a
4 changes: 2 additions & 2 deletions src/pages/SyncProviderPage/SyncButton.spec.tsx
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ describe('SyncButton', () => {
it('renders sync button', () => {
render(<SyncButton provider="gl" />, { wrapper })

const link = screen.getByRole('link', { name: /Sync with Gitlab/ })
const link = screen.getByRole('link', { name: /Sync with GitLab/ })

const expectedRedirect = encodeURIComponent('http://localhost/gl')
expect(link).toBeInTheDocument()
@@ -65,7 +65,7 @@ describe('SyncButton', () => {
render(<SyncButton provider="gle" />, { wrapper })

const link = screen.getByRole('link', {
name: /Sync with Gitlab Enterprise/,
name: /Sync with GitLab Enterprise/,
})

const expectedRedirect = encodeURIComponent('http://localhost/gle')
2 changes: 1 addition & 1 deletion src/pages/SyncProviderPage/SyncProviderPage.spec.tsx
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ describe('SyncProviderPage', () => {
render(<SyncProviderPage />, { wrapper })

const gheSyncButton = await screen.findByText(
/Sync with Gitlab Enterprise/
/Sync with GitLab Enterprise/
)
expect(gheSyncButton).toBeInTheDocument()
})
8 changes: 4 additions & 4 deletions src/shared/utils/provider.js
Original file line number Diff line number Diff line change
@@ -9,15 +9,15 @@ export function providerToName(provider, forRender = false) {
return {
gh: forRender ? 'GitHub' : 'Github',
bb: 'BitBucket',
gl: 'Gitlab',
gl: forRender ? 'GitLab' : 'Gitlab',
ghe: forRender ? 'GitHub Enterprise' : 'Github Enterprise',
gle: 'Gitlab Enterprise',
gle: forRender ? 'GitLab Enterprise' : 'Gitlab Enterprise',
bbs: 'BitBucket Server',
github: forRender ? 'GitHub' : 'Github',
bitbucket: 'BitBucket',
gitlab: 'Gitlab',
gitlab: forRender ? 'GitLab' : 'Gitlab',
github_enterprise: forRender ? 'GitHub Enterprise' : 'Github Enterprise',
gitlab_enterprise: 'Gitlab Enterprise',
gitlab_enterprise: forRender ? 'GitLab Enterprise' : 'Gitlab Enterprise',
bitbucket_server: 'BitBucket Server',
}[provider.toLowerCase()]
}
28 changes: 24 additions & 4 deletions src/shared/utils/provider.spec.js
Original file line number Diff line number Diff line change
@@ -30,6 +30,12 @@ describe('providerToName', () => {
})
})

describe('when called with gl and for render', () => {
it('returns GitLab', () => {
expect(providerToName('gl', true)).toBe('GitLab')
})
})

describe('when called with bb', () => {
it('returns BitBucket', () => {
expect(providerToName('bb')).toBe('BitBucket')
@@ -42,9 +48,9 @@ describe('providerToName', () => {
})
})

describe('when called with gle', () => {
it('returns Gitlab Enterprise', () => {
expect(providerToName('gle')).toBe('Gitlab Enterprise')
describe('when called with gle with render', () => {
it('returns GitLab Enterprise', () => {
expect(providerToName('gle', true)).toBe('GitLab Enterprise')
})
})

@@ -60,7 +66,7 @@ describe('providerToName', () => {
})
})

describe('when called with Github and for Render', () => {
describe('when called with Github and for render', () => {
it('returns GitHub', () => {
expect(providerToName('github', true)).toBe('GitHub')
})
@@ -72,6 +78,12 @@ describe('providerToName', () => {
})
})

describe('when called with Gitlab and for render', () => {
it('returns GitLab', () => {
expect(providerToName('gitlab', true)).toBe('GitLab')
})
})

describe('when called with BitBucket', () => {
it('returns BitBucket', () => {
expect(providerToName('BitBucket')).toBe('BitBucket')
@@ -90,6 +102,14 @@ describe('providerToName', () => {
})
})

describe('when called with gitlab-enterprise for render', () => {
it('returns GitLab Enterprise', () => {
expect(providerToName('gitlab_enterprise', true)).toBe(
'GitLab Enterprise'
)
})
})

describe('when called with bitbucket_server', () => {
it('returns BitBucket Server', () => {
expect(providerToName('bitbucket_server')).toBe('BitBucket Server')