From fa56755f9b84fa981de49ec1c697a88d7cfe8847 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 26 Mar 2018 12:10:01 -0700 Subject: [PATCH] Remove political references (#1595) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “When you expose a problem you pose a problem.” — Sara Ahmed --- .../acceptance/dashboard/repositories-test.js | 4 +-- tests/acceptance/home/broadcasts-test.js | 16 ++++----- tests/acceptance/home/sidebar-tabs-test.js | 8 ++--- .../acceptance/home/with-repositories-test.js | 30 ++++++++-------- tests/acceptance/owner/repos-test.js | 16 ++++----- tests/acceptance/profile/basic-layout-test.js | 36 +++++++++---------- tests/acceptance/profile/filtering-test.js | 26 +++++++------- tests/acceptance/profile/not-found-test.js | 4 +-- .../profile/update-repositories-test.js | 22 ++++++------ tests/acceptance/profile/view-token-test.js | 12 +++---- tests/acceptance/repo/branches-test.js | 20 +++++------ .../acceptance/repo/build-list-routes-test.js | 16 ++++----- tests/acceptance/repo/caches-test.js | 8 ++--- tests/acceptance/repo/settings-test.js | 28 +++++++-------- tests/acceptance/repo/show-test.js | 8 ++--- tests/integration/v2-serializer-test.js | 20 +++++------ tests/integration/v3-serializer-test.js | 18 +++++----- 17 files changed, 146 insertions(+), 146 deletions(-) diff --git a/tests/acceptance/dashboard/repositories-test.js b/tests/acceptance/dashboard/repositories-test.js index 222a1536b8..41845fda8c 100644 --- a/tests/acceptance/dashboard/repositories-test.js +++ b/tests/acceptance/dashboard/repositories-test.js @@ -6,8 +6,8 @@ import topPage from 'travis/tests/pages/top'; moduleForAcceptance('Acceptance | dashboard/repositories', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); diff --git a/tests/acceptance/home/broadcasts-test.js b/tests/acceptance/home/broadcasts-test.js index 673550028f..cf844bfa7c 100644 --- a/tests/acceptance/home/broadcasts-test.js +++ b/tests/acceptance/home/broadcasts-test.js @@ -6,15 +6,15 @@ import topPage from 'travis/tests/pages/top'; moduleForAcceptance('Acceptance | broadcasts', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); signInUser(currentUser); // create active repo server.create('repository', { - slug: 'killjoys/living-a-feminist-life' + slug: 'org-login/repository-name' }); } }); @@ -24,12 +24,12 @@ test('the broadcast tower shows a warning even when an announcement exists, broa server.create('broadcast', { category: 'warning', - message: 'Join the resistance!' + message: 'A warning' }); server.create('broadcast', { category: 'announcement', - message: 'We need you.', + message: 'An announcement', id: 2016 }); @@ -48,10 +48,10 @@ test('the broadcast tower shows a warning even when an announcement exists, broa assert.equal(topPage.broadcasts.items.length, 2, 'expected there to be two broadcasts'); assert.ok(topPage.broadcasts.items[0].isAnnouncement, 'expected the first broadcast to be an announcement'); - assert.equal(topPage.broadcasts.items[0].message, 'We need you.'); + assert.equal(topPage.broadcasts.items[0].message, 'An announcement'); assert.ok(topPage.broadcasts.items[1].isWarning, 'expected the second broadcast to be a warning'); - assert.equal(topPage.broadcasts.items[1].message, 'Join the resistance!'); + assert.equal(topPage.broadcasts.items[1].message, 'A warning'); }); percySnapshot(assert); @@ -72,7 +72,7 @@ test('the broadcast tower shows an announcement', assert => { server.create('broadcast', { category: 'announcement', - message: 'We have all joined the resistance.' + message: 'Another announcement' }); dashboardPage.visit(); diff --git a/tests/acceptance/home/sidebar-tabs-test.js b/tests/acceptance/home/sidebar-tabs-test.js index 11c9f89fcd..3410795bc4 100644 --- a/tests/acceptance/home/sidebar-tabs-test.js +++ b/tests/acceptance/home/sidebar-tabs-test.js @@ -5,20 +5,20 @@ import sidebarPage from 'travis/tests/pages/sidebar'; moduleForAcceptance('Acceptance | home/sidebar tabs', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); signInUser(currentUser); // create active repo server.create('repository', { - slug: 'killjoys/living-a-feminist-life' + slug: 'org-login/repository-name' }); // create active repo let testRepo = server.create('repository', { - slug: 'killjoys/willful-subjects' + slug: 'org-login/yet-another-repository-name' }); this.repo = testRepo; diff --git a/tests/acceptance/home/with-repositories-test.js b/tests/acceptance/home/with-repositories-test.js index 1b8915af34..2c087a3ffb 100644 --- a/tests/acceptance/home/with-repositories-test.js +++ b/tests/acceptance/home/with-repositories-test.js @@ -8,18 +8,18 @@ const repoId = 100; const repositoryTemplate = { id: repoId, - slug: 'killjoys/living-a-feminist-life', + slug: 'org-login/repository-name', owner: { - login: 'killjoys' + login: 'org-login' }, - name: 'living-a-feminist-life' + name: 'repository-name' }; moduleForAcceptance('Acceptance | home/with repositories', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); signInUser(currentUser); @@ -32,16 +32,16 @@ moduleForAcceptance('Acceptance | home/with repositories', { }); server.create('repository', { - slug: 'killjoys/queer-phenomenology' + slug: 'org-login/some-other-repository-name' }); // create active repo server.create('repository', { - slug: 'killjoys/willful-subjects', + slug: 'org-login/yet-another-repository-name', owner: { - login: 'killjoys' + login: 'org-login' }, - name: 'willful-subjects' + name: 'yet-another-repository-name' }).createBuild({ id: 99, number: '1', @@ -63,9 +63,9 @@ test('the home page shows the repositories', function (assert) { andThen(() => {}); andThen(() => { assert.equal(sidebarPage.sidebarRepositories.length, 3, 'expected three repositories in the sidebar'); - assert.equal(sidebarPage.sidebarRepositories[0].name, 'killjoys/willful-subjects'); - assert.equal(sidebarPage.sidebarRepositories[1].name, 'killjoys/queer-phenomenology'); - assert.equal(sidebarPage.sidebarRepositories[2].name, 'killjoys/living-a-feminist-life'); + assert.equal(sidebarPage.sidebarRepositories[0].name, 'org-login/yet-another-repository-name'); + assert.equal(sidebarPage.sidebarRepositories[1].name, 'org-login/some-other-repository-name'); + assert.equal(sidebarPage.sidebarRepositories[2].name, 'org-login/repository-name'); }); }); @@ -76,10 +76,10 @@ test('Pusher events change the main display', function (assert) { // TODO: Remove this andThen(() => {}); andThen(() => { - assert.equal(sidebarPage.repoTitle, 'killjoys / willful-subjects', 'expected the displayed repository to be the one with a running build'); + assert.equal(sidebarPage.repoTitle, 'org-login / yet-another-repository-name', 'expected the displayed repository to be the one with a running build'); }); - let gitUser = server.create('git-user', { name: 'Sara Ahmed' }); + let gitUser = server.create('git-user', { name: 'User Name' }); const commit = server.create('commit', { id: 100, sha: 'acab', @@ -141,7 +141,7 @@ test('Pusher events change the main display', function (assert) { }); andThen(() => { - assert.equal(sidebarPage.repoTitle, 'killjoys / living-a-feminist-life', 'the displayed repository should have changed'); + assert.equal(sidebarPage.repoTitle, 'org-login / repository-name', 'the displayed repository should have changed'); }); andThen(() => { diff --git a/tests/acceptance/owner/repos-test.js b/tests/acceptance/owner/repos-test.js index 0b0c573119..ec10ae0368 100644 --- a/tests/acceptance/owner/repos-test.js +++ b/tests/acceptance/owner/repos-test.js @@ -5,13 +5,13 @@ import ownerPage from 'travis/tests/pages/owner'; moduleForAcceptance('Acceptance | owner repositories', { beforeEach() { server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); // create active repo const firstRepository = server.create('repository', { - slug: 'feministkilljoy/living-a-feminist-life' + slug: 'user-login/repository-name' }); const primaryBranch = firstRepository.createBranch({ @@ -39,7 +39,7 @@ moduleForAcceptance('Acceptance | owner repositories', { // create active repo server.create('repository', { - slug: 'feministkilljoy/willful-subjects' + slug: 'user-login/yet-another-repository-name' }); server.create('repository', { @@ -50,15 +50,15 @@ moduleForAcceptance('Acceptance | owner repositories', { }); test('the owner page shows their repositories', (assert) => { - ownerPage.visit({ username: 'feministkilljoy' }); + ownerPage.visit({ username: 'user-login' }); andThen(() => { - assert.equal(document.title, 'Sara Ahmed - Travis CI'); + assert.equal(document.title, 'User Name - Travis CI'); assert.equal(ownerPage.repos.length, 2); ownerPage.repos[0].as(repo => { - assert.equal(repo.name, 'living-a-feminist-life'); + assert.equal(repo.name, 'repository-name'); assert.equal(repo.buildNumber, '1917'); assert.equal(repo.defaultBranch, 'primary'); @@ -67,7 +67,7 @@ test('the owner page shows their repositories', (assert) => { }); ownerPage.repos[1].as(repo => { - assert.equal(repo.name, 'willful-subjects'); + assert.equal(repo.name, 'yet-another-repository-name'); assert.equal(repo.noBuildMessage, 'There is no build on the default branch yet.'); }); }); diff --git a/tests/acceptance/profile/basic-layout-test.js b/tests/acceptance/profile/basic-layout-test.js index fe78879dc2..8e645e3859 100644 --- a/tests/acceptance/profile/basic-layout-test.js +++ b/tests/acceptance/profile/basic-layout-test.js @@ -5,8 +5,8 @@ import profilePage from 'travis/tests/pages/profile'; moduleForAcceptance('Acceptance | profile/basic layout', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); @@ -14,17 +14,17 @@ moduleForAcceptance('Acceptance | profile/basic layout', { // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30 }); // create active repository server.create('repository', { - name: 'living-a-feminist-life', + name: 'repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -34,9 +34,9 @@ moduleForAcceptance('Acceptance | profile/basic layout', { // create inactive repository server.create('repository', { - name: 'willful-subjects', + name: 'yet-another-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: false, permissions: { @@ -46,9 +46,9 @@ moduleForAcceptance('Acceptance | profile/basic layout', { // create repository without admin permissions server.create('repository', { - name: 'affect-theory-reader', + name: 'other-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -68,29 +68,29 @@ moduleForAcceptance('Acceptance | profile/basic layout', { }); test('view profile', function (assert) { - profilePage.visit({ username: 'feministkilljoy' }); + profilePage.visit({ username: 'user-login' }); andThen(function () { percySnapshot(assert); - assert.equal(document.title, 'Sara Ahmed - Profile - Travis CI'); + assert.equal(document.title, 'User Name - Profile - Travis CI'); - assert.equal(profilePage.name, 'Sara Ahmed'); + assert.equal(profilePage.name, 'User Name'); assert.equal(profilePage.accounts.length, 2, 'expected two accounts'); - assert.equal(profilePage.accounts[0].name, 'Sara Ahmed'); + assert.equal(profilePage.accounts[0].name, 'User Name'); assert.equal(profilePage.accounts[0].repositoryCount, '3 repositories'); - assert.equal(profilePage.accounts[1].name, 'Feminist Killjoys'); + assert.equal(profilePage.accounts[1].name, 'Org Name'); assert.equal(profilePage.accounts[1].repositoryCount, '30 repositories'); assert.equal(profilePage.administerableRepositories.length, 3, 'expected three repositories'); - assert.equal(profilePage.administerableRepositories[0].name, 'feministkilljoy/affect-theory-reader'); + assert.equal(profilePage.administerableRepositories[0].name, 'user-login/other-repository-name'); assert.ok(profilePage.administerableRepositories[0].isDisabled, 'expected disabled repository to be disabled in UI'); - assert.equal(profilePage.administerableRepositories[1].name, 'feministkilljoy/living-a-feminist-life'); + assert.equal(profilePage.administerableRepositories[1].name, 'user-login/repository-name'); assert.ok(profilePage.administerableRepositories[1].isActive, 'expected active repository to appear active'); - assert.equal(profilePage.administerableRepositories[2].name, 'feministkilljoy/willful-subjects'); + assert.equal(profilePage.administerableRepositories[2].name, 'user-login/yet-another-repository-name'); assert.notOk(profilePage.administerableRepositories[2].isActive, 'expected inactive repository to appear inactive'); }); }); diff --git a/tests/acceptance/profile/filtering-test.js b/tests/acceptance/profile/filtering-test.js index bac9d7d878..925b9ade73 100644 --- a/tests/acceptance/profile/filtering-test.js +++ b/tests/acceptance/profile/filtering-test.js @@ -5,8 +5,8 @@ import profilePage from 'travis/tests/pages/profile'; moduleForAcceptance('Acceptance | profile/filtering', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); @@ -14,17 +14,17 @@ moduleForAcceptance('Acceptance | profile/filtering', { // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30 }); // create active repository server.create('repository', { - name: 'living-a-feminist-life', + name: 'specific-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -34,9 +34,9 @@ moduleForAcceptance('Acceptance | profile/filtering', { // create inactive repository server.create('repository', { - name: 'willful-subjects', + name: 'yet-another-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: false, permissions: { @@ -46,9 +46,9 @@ moduleForAcceptance('Acceptance | profile/filtering', { // create repository without admin permissions server.create('repository', { - name: 'affect-theory-reader', + name: 'other-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -68,7 +68,7 @@ moduleForAcceptance('Acceptance | profile/filtering', { }); test('filter profile repositories', function (assert) { - profilePage.visit({ username: 'feministkilljoy' }); + profilePage.visit({ username: 'user-login' }); andThen(function () { assert.equal(profilePage.administerableRepositories.length, 3, 'expected three repositories'); @@ -80,12 +80,12 @@ test('filter profile repositories', function (assert) { assert.equal(profilePage.noRepositoriesFoundByFilter, 'Sorry, no results found.'); }); - profilePage.filter('feminist-lf'); + profilePage.filter('spec'); andThen(function () { percySnapshot(assert); assert.equal(profilePage.administerableRepositories.length, 1, 'expected one repository'); - assert.equal(profilePage.administerableRepositories[0].name, 'feministkilljoy/living-a-feminist-life'); + assert.equal(profilePage.administerableRepositories[0].name, 'user-login/specific-repository-name'); }); }); }); diff --git a/tests/acceptance/profile/not-found-test.js b/tests/acceptance/profile/not-found-test.js index 56ab8c0651..ea64b9db66 100644 --- a/tests/acceptance/profile/not-found-test.js +++ b/tests/acceptance/profile/not-found-test.js @@ -5,8 +5,8 @@ import profilePage from 'travis/tests/pages/profile'; moduleForAcceptance('Acceptance | profile/not found', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); diff --git a/tests/acceptance/profile/update-repositories-test.js b/tests/acceptance/profile/update-repositories-test.js index 1303d428fe..7450bd8a9a 100644 --- a/tests/acceptance/profile/update-repositories-test.js +++ b/tests/acceptance/profile/update-repositories-test.js @@ -5,8 +5,8 @@ import profilePage from 'travis/tests/pages/profile'; moduleForAcceptance('Acceptance | profile/update-repositories', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3, }); @@ -14,17 +14,17 @@ moduleForAcceptance('Acceptance | profile/update-repositories', { // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30, }); // create active repository server.create('repository', { - name: 'living-a-feminist-life', + name: 'repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -34,9 +34,9 @@ moduleForAcceptance('Acceptance | profile/update-repositories', { // create inactive repository server.create('repository', { - name: 'willful-subjects', + name: 'yet-another-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: false, permissions: { @@ -46,9 +46,9 @@ moduleForAcceptance('Acceptance | profile/update-repositories', { // create repository without admin permissions server.create('repository', { - name: 'affect-theory-reader', + name: 'other-repository-name', owner: { - login: 'feministkilljoy', + login: 'user-login', }, active: true, permissions: { @@ -71,7 +71,7 @@ moduleForAcceptance('Acceptance | profile/update-repositories', { }); test('updating repository', function (assert) { - profilePage.visit({ username: 'feministkilljoy' }); + profilePage.visit({ username: 'user-login' }); andThen(() => { profilePage.administerableRepositories[0].toggle(); diff --git a/tests/acceptance/profile/view-token-test.js b/tests/acceptance/profile/view-token-test.js index 8405a78bbf..c93ee98887 100644 --- a/tests/acceptance/profile/view-token-test.js +++ b/tests/acceptance/profile/view-token-test.js @@ -6,8 +6,8 @@ import config from 'travis/config/environment'; moduleForAcceptance('Acceptance | profile/view token', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); @@ -15,16 +15,16 @@ moduleForAcceptance('Acceptance | profile/view token', { // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30 }); } }); test('view token', function (assert) { - profilePage.visit({ username: 'feministkilljoy' }); + profilePage.visit({ username: 'user-login' }); andThen(() => { assert.equal(profilePage.token.obfuscatedCharacters, '••••••••••••••••••••', 'expected token to be obfuscated by default'); @@ -39,7 +39,7 @@ test('view token', function (assert) { }); test('copy token', function (assert) { - profilePage.visit({ username: 'feministkilljoy' }); + profilePage.visit({ username: 'user-login' }); andThen(() => { assert.equal(profilePage.token.obfuscatedCharacters, '••••••••••••••••••••', 'expected token to be obfuscated by default'); diff --git a/tests/acceptance/repo/branches-test.js b/tests/acceptance/repo/branches-test.js index 8ee8bd1f8c..9eac592105 100644 --- a/tests/acceptance/repo/branches-test.js +++ b/tests/acceptance/repo/branches-test.js @@ -5,28 +5,28 @@ import branchesPage from 'travis/tests/pages/branches'; moduleForAcceptance('Acceptance | repo branches', { beforeEach() { this.currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); signInUser(this.currentUser); const gitUser = server.create('git-user', { - name: 'Sara Ahmed' + name: 'User Name' }); // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30 }); const repository = server.create('repository', { - name: 'living-a-feminist-life', - slug: 'killjoys/living-a-feminist-life' + name: 'repository-name', + slug: 'org-login/repository-name' }); const repoId = parseInt(repository.id); @@ -158,10 +158,10 @@ moduleForAcceptance('Acceptance | repo branches', { }); test('view branches', function (assert) { - branchesPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + branchesPage.visit({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { - assert.equal(document.title, 'killjoys/living-a-feminist-life - Travis CI'); + assert.equal(document.title, 'org-login/repository-name - Travis CI'); assert.ok(branchesPage.branchesTabActive, 'Branches tab is active when visiting /org/repo/branches'); }); @@ -171,7 +171,7 @@ test('view branches', function (assert) { assert.equal(branchesPage.defaultBranch.buildCount, '3 builds'); assert.equal(branchesPage.defaultBranch.request, '1919 passed'); assert.equal(branchesPage.defaultBranch.commitSha, '1234567'); - assert.equal(branchesPage.defaultBranch.committer, 'Sara Ahmed'); + assert.equal(branchesPage.defaultBranch.committer, 'User Name'); assert.equal(branchesPage.defaultBranch.commitDate, 'about a year ago'); const buildTiles = branchesPage.defaultBranch.buildTiles; diff --git a/tests/acceptance/repo/build-list-routes-test.js b/tests/acceptance/repo/build-list-routes-test.js index 010d0e59ce..8989f65abe 100644 --- a/tests/acceptance/repo/build-list-routes-test.js +++ b/tests/acceptance/repo/build-list-routes-test.js @@ -9,18 +9,18 @@ import generatePusherPayload from 'travis/tests/helpers/generate-pusher-payload' moduleForAcceptance('Acceptance | repo build list routes', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); signInUser(currentUser); const gitUser = server.create('git-user', { - name: 'Sara Ahmed' + name: 'User Name' }); const repository = server.create('repository', { - slug: 'killjoys/living-a-feminist-life' + slug: 'org-login/repository-name' }); this.repository = repository; @@ -125,7 +125,7 @@ moduleForAcceptance('Acceptance | repo build list routes', { test('build history shows, more can be loaded, and a created build gets added and can be cancelled', function (assert) { assert.expect(22); - page.visitBuildHistory({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + page.visitBuildHistory({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { assert.equal(page.builds.length, 4, 'expected four non-PR builds'); @@ -133,7 +133,7 @@ test('build history shows, more can be loaded, and a created build gets added an page.builds[0].as(build => { assert.ok(build.passed, 'expected the first build to have passed'); assert.equal(build.name, 'successful-cron-branch'); - assert.equal(build.committer, 'Sara Ahmed'); + assert.equal(build.committer, 'User Name'); assert.equal(build.commitSha, '1234567'); assert.equal(build.commitDate, 'about a year ago'); assert.equal(build.requestIconTitle, 'Triggered by a cron job'); @@ -252,7 +252,7 @@ test('build history shows, more can be loaded, and a created build gets added an test('view and cancel pull requests', function (assert) { assert.expect(10); - page.visitPullRequests({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + page.visitPullRequests({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { assert.equal(page.builds.length, 1, 'expected one pull request build'); @@ -261,7 +261,7 @@ test('view and cancel pull requests', function (assert) { assert.ok(pullRequest.started, 'expected the pull request to have started'); assert.equal(pullRequest.name, 'PR #2010'); assert.equal(pullRequest.message, 'A pull request'); - assert.equal(pullRequest.committer, 'Sara Ahmed'); + assert.equal(pullRequest.committer, 'User Name'); assert.equal(pullRequest.commitSha, '1234567'); assert.equal(pullRequest.commitDate, 'about a year ago'); assert.equal(pullRequest.duration, '5 min'); diff --git a/tests/acceptance/repo/caches-test.js b/tests/acceptance/repo/caches-test.js index ee357007a5..98549d3e11 100644 --- a/tests/acceptance/repo/caches-test.js +++ b/tests/acceptance/repo/caches-test.js @@ -5,14 +5,14 @@ import page from 'travis/tests/pages/caches'; moduleForAcceptance('Acceptance | repo caches', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy' + name: 'User Name', + login: 'user-login' }); signInUser(currentUser); const repository = server.create('repository', { - slug: 'killjoys/living-a-feminist-life' + slug: 'org-login/repository-name' }); this.repository = repository; @@ -36,7 +36,7 @@ moduleForAcceptance('Acceptance | repo caches', { }); test('view and delete caches', function (assert) { - page.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + page.visit({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { assert.equal(page.pushCaches.length, 1, 'expected one push cache'); diff --git a/tests/acceptance/repo/settings-test.js b/tests/acceptance/repo/settings-test.js index 21b249ce24..94ddbc75fd 100644 --- a/tests/acceptance/repo/settings-test.js +++ b/tests/acceptance/repo/settings-test.js @@ -10,8 +10,8 @@ import moment from 'moment'; moduleForAcceptance('Acceptance | repo settings', { beforeEach() { const currentUser = server.create('user', { - name: 'Sara Ahmed', - login: 'feministkilljoy', + name: 'User Name', + login: 'user-login', repos_count: 3 }); @@ -19,15 +19,15 @@ moduleForAcceptance('Acceptance | repo settings', { // create organization server.create('account', { - name: 'Feminist Killjoys', + name: 'Org Name', type: 'organization', - login: 'killjoys', + login: 'org-login', repos_count: 30 }); const repository = server.create('repository', { - name: 'living-a-feminist-life', - slug: 'killjoys/living-a-feminist-life', + name: 'repository-name', + slug: 'org-login/repository-name', }); repository.attrs.permissions.create_cron = true; @@ -89,7 +89,7 @@ moduleForAcceptance('Acceptance | repo settings', { }); test('view settings', function (assert) { - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); andThen(function () { assert.ok(settingsPage.buildOnlyWithTravisYml.isActive, 'expected builds only with .travis.yml'); @@ -141,7 +141,7 @@ test('view settings', function (assert) { }); test('change general settings', function (assert) { - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); const settingToRequestBody = {}; @@ -187,7 +187,7 @@ test('change general settings', function (assert) { }); test('delete and create environment variables', function (assert) { - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); const deletedIds = []; @@ -268,7 +268,7 @@ test('delete and create environment variables', function (assert) { test('delete and create crons', function (assert) { const done = assert.async(); - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); const deletedIds = []; @@ -297,7 +297,7 @@ test('reload cron branches on branch:created', function (assert) { repository: this.repository, }); - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { assert.equal(settingsPage.cronBranches.length, 1, 'expected only one branch'); @@ -322,7 +322,7 @@ test('reload cron branches on branch:created', function (assert) { }); test('delete SSH key', function (assert) { - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); const deletedIds = []; @@ -360,7 +360,7 @@ test('add SSH key', function (assert) { }; }); - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); settingsPage.sshKeyForm.fillDescription('hey'); settingsPage.sshKeyForm.fillKey('hello'); @@ -379,7 +379,7 @@ test('on a repository with auto-cancellation', function (assert) { this.repository.createSetting({ name: 'auto_cancel_pushes', value: true }); this.repository.createSetting({ name: 'auto_cancel_pull_requests', value: false }); - settingsPage.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + settingsPage.visit({ organization: 'org-login', repo: 'repository-name' }); andThen(() => { assert.ok(settingsPage.autoCancellationSection.exists, 'expected auto-cancellation section to exist'); diff --git a/tests/acceptance/repo/show-test.js b/tests/acceptance/repo/show-test.js index 0817e6a03b..5172d33109 100644 --- a/tests/acceptance/repo/show-test.js +++ b/tests/acceptance/repo/show-test.js @@ -5,8 +5,8 @@ import page from 'travis/tests/pages/repo/show'; moduleForAcceptance('Acceptance | show repo page', { beforeEach() { const repository = server.create('repository', { - name: 'living-a-feminist-life', - slug: 'killjoys/living-a-feminist-life' + name: 'repository-name', + slug: 'org-login/repository-name' }); repository.createBranch({ @@ -24,12 +24,12 @@ moduleForAcceptance('Acceptance | show repo page', { }); test('loading branches doesnt update the default branch on the repo', function (assert) { - page.visit({ organization: 'killjoys', repo: 'living-a-feminist-life' }); + page.visit({ organization: 'org-login', repo: 'repository-name' }); page.openStatusImagePopup(); andThen(() => { const url = new URL(page.statusBadgeImageSrc); const expectedPath = `${url.pathname}?${url.searchParams}`; - assert.equal(expectedPath, '/killjoys/living-a-feminist-life.svg?branch=feminist%23yes'); + assert.equal(expectedPath, '/org-login/repository-name.svg?branch=feminist%23yes'); }); }); diff --git a/tests/integration/v2-serializer-test.js b/tests/integration/v2-serializer-test.js index 5863072f07..c752414b93 100644 --- a/tests/integration/v2-serializer-test.js +++ b/tests/integration/v2-serializer-test.js @@ -23,12 +23,12 @@ module('Integration | Mirage Serializer | V2Serializer', { blogPost: Model.extend() }); - const author = this.schema.authors.create({ name: 'Sara Ahmed' }); + const author = this.schema.authors.create({ name: 'User Name' }); - author.createBook({ title: 'Willful Subjects' }); - author.createBook({ title: 'On Being Included' }); + author.createBook({ title: 'A Book' }); + author.createBook({ title: 'A Different Book' }); - this.schema.blogPosts.create({ title: 'Equality Credentials' }); + this.schema.blogPosts.create({ title: 'A Blog Post' }); this.registry = new SerializerRegistry(this.schema, { application: V2Serializer @@ -48,11 +48,11 @@ test('it serialises with underscored property keys', function (assert) { books: [{ id: '1', author_id: '1', - title: 'Willful Subjects' + title: 'A Book' }, { id: '2', author_id: '1', - title: 'On Being Included' + title: 'A Different Book' }] }); }); @@ -72,16 +72,16 @@ test('it sideloads included resources', function (assert) { authors: [{ id: '1', book_ids: ['1', '2'], - name: 'Sara Ahmed' + name: 'User Name' }], books: [{ id: '1', author_id: '1', - title: 'Willful Subjects' + title: 'A Book' }, { id: '2', author_id: '1', - title: 'On Being Included' + title: 'A Different Book' }] }); }); @@ -93,7 +93,7 @@ test('it uses an underscored container key', function (assert) { assert.deepEqual(result, { blog_post: { id: '1', - title: 'Equality Credentials' + title: 'A Blog Post' } }); }); diff --git a/tests/integration/v3-serializer-test.js b/tests/integration/v3-serializer-test.js index 5cd59a718b..783313668b 100644 --- a/tests/integration/v3-serializer-test.js +++ b/tests/integration/v3-serializer-test.js @@ -23,10 +23,10 @@ module('Integration | Mirage Serializer | V3Serializer', { }) }); - const author = this.schema.authors.create({ name: 'Sara Ahmed' }); + const author = this.schema.authors.create({ name: 'User Name' }); - author.createBook({ title: 'Willful Subjects' }); - author.createBook({ title: 'On Being Included' }); + author.createBook({ title: 'A Book' }); + author.createBook({ title: 'A Different Book' }); this.registry = new SerializerRegistry(this.schema, { application: V3Serializer, @@ -53,18 +53,18 @@ test('it serialises a collection with underscored property keys and pagination', books: [{ id: '1', author_id: '1', - title: 'Willful Subjects', + title: 'A Book', author: { id: '1', - name: 'Sara Ahmed' + name: 'User Name' } }, { id: '2', author_id: '1', - title: 'On Being Included', + title: 'A Different Book', author: { id: '1', - name: 'Sara Ahmed' + name: 'User Name' } }] }); @@ -85,10 +85,10 @@ test('it serialises a single resource with its properties included directly and '@type': 'book', id: '1', author_id: '1', - title: 'Willful Subjects', + title: 'A Book', author: { id: '1', - name: 'Sara Ahmed' + name: 'User Name' } }); });