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.

Sign up for GitHub

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

Jump to bottom

Prefix action strings to namespace them. #843

Merged
merged 6 commits into from
Jul 2, 2016
Merged

Prefix action strings to namespace them. #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8132c99
Update Actions.js
ThaJay Jun 21, 2016
05c9c0c
Merge pull request #1 from ThaJay/ThaJay-patch-1
ThaJay Jun 21, 2016
5eff817
Update Reducer.test.js to reflect new action strings
ThaJay Jun 22, 2016
0afc60e
action strings in Reducer.test.js
Jun 22, 2016
7e24b4d
Update action strings as per discussion
ThaJay Jun 28, 2016
fc40bad
Update action strings as per discussion
ThaJay Jun 28, 2016
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
18 changes: 9 additions & 9 deletions src/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
*/
import { assert } from './Util';
import Scene from './Scene';
export const JUMP_ACTION = 'jump';
export const PUSH_ACTION = 'push';
export const REPLACE_ACTION = 'replace';
export const POP_ACTION2 = 'back';
export const POP_ACTION = 'BackAction';
export const POP_TO = 'popTo';
export const REFRESH_ACTION = 'refresh';
export const RESET_ACTION = 'reset';
export const FOCUS_ACTION = 'focus';
export const JUMP_ACTION = 'REACT_NATIVE_ROUTER_FLUX_JUMP';
export const PUSH_ACTION = 'REACT_NATIVE_ROUTER_FLUX_PUSH';
export const REPLACE_ACTION = 'REACT_NATIVE_ROUTER_FLUX_REPLACE';
export const POP_ACTION2 = 'REACT_NATIVE_ROUTER_FLUX_BACK';
export const POP_ACTION = 'REACT_NATIVE_ROUTER_FLUX_BACK_ACTION';
export const POP_TO = 'REACT_NATIVE_ROUTER_FLUX_POP_TO';
export const REFRESH_ACTION = 'REACT_NATIVE_ROUTER_FLUX_REFRESH';
export const RESET_ACTION = 'REACT_NATIVE_ROUTER_FLUX_RESET';
export const FOCUS_ACTION = 'REACT_NATIVE_ROUTER_FLUX_FOCUS';

function filterParam(data) {
if (data.toString() !== '[object Object]') {
Expand Down
17 changes: 9 additions & 8 deletions test/Reducer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,46 +64,47 @@ describe('createReducer', () => {
// Normally actions came from Actions module, but we will generate it manually.
latestState = reducer(latestState, {
key: 'conversations',
type: 'push',
type: 'REACT_NATIVE_ROUTER_FLUX_PUSH',
param1: 'Hello world',
});

currentScene = getCurrent(latestState);
expect(currentScene.name).equal('conversations');
expect(currentScene.sceneKey).equal('conversations');
expect(currentScene.type).equal('push');
expect(currentScene.type).equal('REACT_NATIVE_ROUTER_FLUX_PUSH');
expect(currentScene.param1).equal('Hello world');

latestState = reducer(latestState, {
key: 'login', // we go to `login` but first renderable child is `loginModal1`
type: 'push',
type: 'REACT_NATIVE_ROUTER_FLUX_PUSH',
param2: 'Hello world2',
});
currentScene = getCurrent(latestState);
expect(currentScene.name).equal('loginModal1');
expect(currentScene.sceneKey).equal('loginModal1');
expect(currentScene.type).equal('push');
expect(currentScene.type).equal('REACT_NATIVE_ROUTER_FLUX_PUSH');
expect(currentScene.param2).equal('Hello world2');

latestState = reducer(latestState, {
key: 'privacyPolicy',
type: 'push',
type: 'REACT_NATIVE_ROUTER_FLUX_PUSH',
param3: 'Accept policy',
});
currentScene = getCurrent(latestState);
expect(currentScene.name).equal('privacyPolicy');
expect(currentScene.sceneKey).equal('privacyPolicy');
expect(currentScene.type).equal('push');
expect(currentScene.type).equal('REACT_NATIVE_ROUTER_FLUX_PUSH');
expect(currentScene.param3).equal('Accept policy');

latestState = reducer(latestState, {
key: 'cubeBar', // we go to cubeBar but first renderable child is `conversations`
type: 'push',
type: 'REACT_NATIVE_ROUTER_FLUX_PUSH',
param1: 'Conversations new param',
});
currentScene = getCurrent(latestState);
expect(currentScene.name).equal('conversations');
expect(currentScene.sceneKey).equal('conversations');
expect(currentScene.type).equal('push');
expect(currentScene.type).equal('REACT_NATIVE_ROUTER_FLUX_PUSH');
expect(currentScene.param1).equal('Conversations new param');
});
});