Skip to content

Commit

Permalink
Remove political references (#1595)
Browse files Browse the repository at this point in the history
“When you expose a problem you pose a problem.” — Sara Ahmed
  • Loading branch information
backspace committed Mar 26, 2018
1 parent a7a0c74 commit fa56755
Show file tree
Hide file tree
Showing 17 changed files with 146 additions and 146 deletions.
4 changes: 2 additions & 2 deletions tests/acceptance/dashboard/repositories-test.js
Expand Up @@ -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
});

Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/home/broadcasts-test.js
Expand Up @@ -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'
});
}
});
Expand All @@ -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
});

Expand All @@ -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);
Expand All @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/home/sidebar-tabs-test.js
Expand Up @@ -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;

Expand Down
30 changes: 15 additions & 15 deletions tests/acceptance/home/with-repositories-test.js
Expand Up @@ -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);
Expand All @@ -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',
Expand All @@ -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');
});
});

Expand All @@ -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',
Expand Down Expand Up @@ -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(() => {
Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/owner/repos-test.js
Expand Up @@ -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({
Expand Down Expand Up @@ -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', {
Expand All @@ -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');
Expand All @@ -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.');
});
});
Expand Down
36 changes: 18 additions & 18 deletions tests/acceptance/profile/basic-layout-test.js
Expand Up @@ -5,26 +5,26 @@ 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
});

signInUser(currentUser);

// 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: {
Expand All @@ -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: {
Expand All @@ -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: {
Expand All @@ -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');
});
});

0 comments on commit fa56755

Please sign in to comment.