Tim Daubenschütz
373d9d13a7
Merge branch 'master' into AP-6-polline-consignment-wallet
...
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:03:06 +01:00
Brett Sun
3be515402c
Merge pull request #101 from ascribe/AD-1387-refactor-global-state-to-be-top-level
...
AD-1387 Refactor global state to be loaded from the top level App component
2016-02-05 15:14:27 +01:00
Brett Sun
4d185ec664
Merge with master
2016-02-05 15:12:05 +01:00
Brett Sun
a79c0f2784
Remove trailing trues on visual regression scripts
...
Doesn’t seem to be eliminating the node failure logs, so we’ll use the
silent flag instead
2016-02-05 14:43:20 +01:00
Brett Sun
40894cfea6
Use the 'ascribe-app' class for all apps
...
Simplifies testing so we can just look for a single class throughout
all the apps when ensuring React has loaded our app
2016-02-05 14:22:42 +01:00
Brett Sun
01b258334a
Fix register work visual test
2016-02-05 14:21:31 +01:00
Brett Sun
325651b581
Remove altUser since the UserStore is now always being passed as a prop
...
Also don’t recycle altWhitelabel on logout as the whitelabel stores
aren’t dependent on the user.
2016-02-05 13:12:58 +01:00
Brett Sun
a020ed6a28
Revert against 8927ccb847
...
Apparently the lack of the `setDropdownState` function is what causes
the page refresh to happen when clicking on a header notification…
2016-02-05 12:04:23 +01:00
Brett Sun
15cf6498a8
Remove unused Cyland hero component
2016-02-05 11:54:02 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
1091e76447
Clean up the prize AccordionList and fix merge bug
2016-02-05 10:39:46 +01:00
Brett Sun
8927ccb847
Guard against the notification dropdown button missing a function
2016-02-05 10:39:24 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Tim Daubenschütz
c18b70f764
Remove sass comment
2016-02-04 15:57:38 +01:00
Tim Daubenschütz
ac2319f231
Cleanup styles for polline.ascribe.io
2016-02-04 15:53:16 +01:00
Brett Sun
37608004e3
Merge pull request #78 from ascribe/AD-1521-refactor-property-padding
...
Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
2016-02-04 15:15:01 +01:00
Brett Sun
9c073bb73b
Fix typo in gemini test output for environment configuration
2016-02-04 15:02:50 +01:00
Brett Sun
2c5b029e08
Merge pull request #99 from ascribe/AD-1396-log-404-page-views-when-previous-view-was-within-the-app
...
AD-1396 Log 404 page views when previous view was within the app
2016-02-04 14:56:45 +01:00
Tim Daubenschütz
88926998a8
Use whitelabel routes for wl-specific requests
2016-02-04 14:46:20 +01:00
Brett Sun
0a4d19677f
Merge with master
2016-02-04 14:00:03 +01:00
Brett Sun
3bb1f65f38
Add whitespace for different npm test scripts
2016-02-04 13:40:40 +01:00
Brett Sun
f1b677dbd1
Use the activeRoute prop to generate route classnames on whitelabels
2016-02-04 13:32:06 +01:00
Brett Sun
8f2ace77af
Use previous method from white labels to get the current active route
2016-02-04 13:32:06 +01:00
Brett Sun
6f2424d103
Rebase remerge
2016-02-04 13:32:00 +01:00
Brett Sun
e616576fa5
Hide the footer if a route has the hideFooter attribute
2016-02-04 13:31:19 +01:00
Brett Sun
764f81925b
Change children prop from react-router to only be a Element type
...
Judging by
https://github.com/rackt/react-router/blob/master/docs/API.md#children-1
and a few inspections in the code, as well as tests, the `children`
prop injected into routes can only ever be a single React Element
object.
This allows us to easily get the active route of a child (if there is
an active route) by querying the `children`’s route prop.
2016-02-04 13:31:18 +01:00
Brett Sun
83012200d1
Separate Sluice styling away from SimplePrize styling
2016-02-04 13:31:18 +01:00
Brett Sun
4e13376d5f
Add route class names to prize app
2016-02-04 13:31:18 +01:00
Brett Sun
39417f3d11
Change screenshot folder for visual tests
2016-02-04 13:31:18 +01:00
Brett Sun
baf75cbee1
Fix shmui visual test
2016-02-04 13:31:18 +01:00
Brett Sun
574378af98
Update README for updated paths to tests
2016-02-04 13:31:18 +01:00
Brett Sun
67b46fb425
Move visual tests to /test/gemini folder
2016-02-04 13:31:18 +01:00
Brett Sun
a51b33857e
Move sauce tests to /test/integration folder
2016-02-04 13:31:17 +01:00
Brett Sun
c3b8b596f1
Rebase remerge
2016-02-04 13:31:16 +01:00
Brett Sun
747f8df06b
Rebase remerge
2016-02-04 13:30:55 +01:00
Brett Sun
afb832dc28
Remove browser-sync notify pop over that shows up in visual tests
2016-02-04 13:30:18 +01:00
Brett Sun
e895c76561
Add whitelabel visual test suite
...
Currently just checks landing page and some pages accessible to
unauthorized users.
2016-02-04 13:30:18 +01:00
Brett Sun
1d09ef1120
Main app visual test suite
2016-02-04 13:30:18 +01:00
Brett Sun
2661f2ba57
Standardize CoaVerify route across apps
2016-02-04 13:30:18 +01:00
Brett Sun
5cfbe5cc39
Rebase remerge
2016-02-04 13:30:16 +01:00
Brett Sun
cb59d042b5
Update docs for PhantomJS 2.1, whitespace, and more tips
2016-02-04 13:29:54 +01:00
Brett Sun
3594229a6e
Rebase remerge
2016-02-04 13:29:33 +01:00
Brett Sun
bd53151964
Add Gemini configuration for desktop and mobile on phantoms
2016-02-04 13:28:55 +01:00
Brett Sun
95bbe410de
Rebase remerge
2016-02-04 13:28:49 +01:00
Brett Sun
3c6dea3585
Merge pull request #146 from ascribe/AD-1519-visual-regression-cli
...
AD-1519 Visual regression tests
2016-02-04 12:03:50 +01:00
Brett Sun
6362a3651f
Remove phantomJS test file
2016-02-04 12:02:12 +01:00
Brett Sun
02c25c323d
Ignore locally generated screenshots
...
Too many minor differences with PhantomJS between OSX/Linux
2016-02-04 12:00:05 +01:00
Brett Sun
f09201d8c3
Use environment to configure timeouts
...
Apparently node doesn’t accept destructuring yet…
2016-02-04 11:59:25 +01:00
Tim Daubenschütz
7dfe6a51a4
For 23vivi, switch back to appropriate piece list
2016-02-04 11:51:54 +01:00
Brett Sun
fd6371e2f1
Small fixes for visual regression tests
2016-02-04 11:26:30 +01:00
