Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit 3945e3c

Browse files
committed
merge develop into e2e, add data-cy tags. changes to home page spec
2 parents 8736b84 + a807264 commit 3945e3c

File tree

46 files changed

+574
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+574
-465
lines changed

.firebaserc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"projects": {
33
"default": "openforge-dev",
4-
"production": "openforge-prod"
4+
"production": "openforge-prod",
5+
"qa": "openforge-qa",
6+
"staging": "openforge-staging"
57
}
6-
}
8+
}

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ node_js:
44
branches:
55
only:
66
- develop
7+
- qa
8+
- staging
79
- master
810
before_script:
911
- npm install -g firebase-tools

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ This project uses [ButterCMS](https://buttercms.com/) as a headless content mana
144144

145145
The project also utilizes webhooks from [ButterCMS](https://buttercms.com/docs/api/?javascript#webhooks) and [Travis](https://docs.travis-ci.com/user/triggering-builds) to keep the prerendered blog content up to date. Whenever a new blog post is published, Butter's webook invokes the cloud function rebuildMaster, which relays the information to the Travis API, which in turn will trigger a rebuild and redeploy of the master branch. Butter's webhooks are managed in the ButterCMS portal.
146146

147+
148+
The branches develop, qa, staging, and master are all set up for continuous integration and deployment with Travis CI and Firebase. To deploy, create a PR for the appropriate branch, or commit and push directly (avoid this if possible).
149+
150+
If manual deployment is needed, use the following. Only do this on the develop branch, follow the PR request flow for all other branches.
151+
147152
### Featured Post
148153

149154
The featured post is managed in the ButterCMS portal. To make a post featured, it must be given a tag of 'featured'. The actual featured post will be the most recently published post with the featured tag. Currently, this post will also appear in the regular list of posts.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
describe('About page', function() {
2+
var env = 'http://localhost:3333'
3+
beforeEach(() => {
4+
cy.visit(env + '/about')
5+
})
6+
})
7+
8+
// Moving this here for now -- from the old home page, but some of this will be relevant here
9+
10+
// describe('Perspectives Section', function () {
11+
// it('Should scroll to the perspectives section', function() {
12+
// cy.get('#perspectives').scrollIntoView()
13+
// })
14+
// })
15+
// describe('About Section - App-Members Component', function() {
16+
// it('Should be able to click links within app-members', function() {
17+
// cy.get('#about').scrollIntoView()
18+
19+
// cy.get('#about > div > app-members > div > div').as('members')
20+
// .its('length').should('be.gt', 13)
21+
22+
// cy.get('@members').contains('Software Engineer')
23+
// cy.get('@members').contains('Designer')
24+
// cy.get('@members').contains('Front End')
25+
26+
// cy.get('@members').find('div:nth-child(1)').find('div.col.text-center').within(function() {
27+
// cy.get('a').should('have.attr', 'href')
28+
// cy.get('a').should('have.attr', 'title')
29+
// cy.get('a').should('have.attr', 'style')
30+
31+
// cy.get('a').eq(0).should('have.attr', 'href', 'mailto:jedi@openforge.io').click()
32+
// cy.get('a').eq(1).should('have.attr', 'href', 'https://twitter.com/jedihacks').click()
33+
// cy.get('a').eq(2).should('have.attr', 'href', 'https://github.com/jedihacks').click()
34+
// })
35+
// })
36+
// })

0 commit comments

Comments
 (0)