Skip to content

Commit 48245be

Browse files
benjiwheelerbenjiwheeler
committed
reverted project state changes in f2291d9 
1 parent efed4d3 commit 48245be

File tree

3 files changed

+24
-81
lines changed

3 files changed

+24
-81
lines changed

‎src/reducers/project-state.js

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const START_AUTO_UPDATING = 'scratch-gui/project-state/START_AUTO_UPDATING';
1717
const START_CREATING_NEW = 'scratch-gui/project-state/START_CREATING_NEW';
1818
const START_ERROR = 'scratch-gui/project-state/START_ERROR';
1919
const START_FETCHING_NEW = 'scratch-gui/project-state/START_FETCHING_NEW';
20-
const START_LOADING_VM_FILE_UPLOAD = 'scratch-gui/project-state/START_LOADING_VM_FILE_UPLOAD';
20+
const START_LOADING_VM_FILE_UPLOAD = 'scratch-gui/project-state/START_LOADING_FILE_UPLOAD';
2121
const START_MANUAL_UPDATING = 'scratch-gui/project-state/START_MANUAL_UPDATING';
2222
const START_REMIXING = 'scratch-gui/project-state/START_REMIXING';
2323
const START_UPDATING_BEFORE_CREATING_COPY = 'scratch-gui/project-state/START_UPDATING_BEFORE_CREATING_COPY';
@@ -435,21 +435,10 @@ const onLoadedProject = (loadingState, canSave, success) => {
435435
default:
436436
return;
437437
}
438-
} else {
439-
switch (loadingState) {
440-
case LoadingState.LOADING_VM_WITH_ID:
441-
case LoadingState.LOADING_VM_FILE_UPLOAD:
442-
return {
443-
type: RETURN_TO_SHOWING
444-
};
445-
case LoadingState.LOADING_VM_NEW_DEFAULT:
446-
return {
447-
type: START_ERROR
448-
};
449-
default:
450-
return;
451-
}
452438
}
439+
return {
440+
type: RETURN_TO_SHOWING
441+
};
453442
};
454443

455444
const doneUpdatingProject = loadingState => {

‎test/unit/reducers/project-state-reducer.test.js

Lines changed: 19 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -92,49 +92,16 @@ test('onFetchedProjectData new loads project data into vm', () => {
9292
expect(resultState.projectData).toBe('1010101');
9393
});
9494

95-
// onLoadedProject: LOADING_VM_WITH_ID
96-
97-
test('onLoadedProject (LOADING_VM_WITH_ID, true, true) shows with id', () => {
98-
const initialState = {
99-
loadingState: LoadingState.LOADING_VM_WITH_ID
100-
};
101-
const action = onLoadedProject(initialState.loadingState, true, true);
102-
const resultState = projectStateReducer(initialState, action);
103-
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITH_ID);
104-
});
105-
106-
test('onLoadedProject (LOADING_VM_WITH_ID, false, true) shows with id', () => {
107-
const initialState = {
108-
loadingState: LoadingState.LOADING_VM_WITH_ID
109-
};
110-
const action = onLoadedProject(initialState.loadingState, true, true);
111-
const resultState = projectStateReducer(initialState, action);
112-
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITH_ID);
113-
});
114-
115-
test('onLoadedProject (LOADING_VM_WITH_ID, false, false), with project id, shows with id', () => {
95+
test('onLoadedProject upload, with canSave false, shows without id', () => {
11696
const initialState = {
117-
loadingState: LoadingState.LOADING_VM_WITH_ID,
118-
projectId: '12345'
119-
};
120-
const action = onLoadedProject(initialState.loadingState, false, false);
121-
const resultState = projectStateReducer(initialState, action);
122-
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITH_ID);
123-
});
124-
125-
test('onLoadedProject (LOADING_VM_WITH_ID, false, false), with no project id, shows without id', () => {
126-
const initialState = {
127-
loadingState: LoadingState.LOADING_VM_WITH_ID,
128-
projectId: null
97+
loadingState: LoadingState.LOADING_VM_FILE_UPLOAD
12998
};
130-
const action = onLoadedProject(initialState.loadingState, false, false);
99+
const action = onLoadedProject(initialState.loadingState, false, true);
131100
const resultState = projectStateReducer(initialState, action);
132101
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITHOUT_ID);
133102
});
134103

135-
// onLoadedProject: LOADING_VM_FILE_UPLOAD
136-
137-
test('onLoadedProject(LOADING_VM_FILE_UPLOAD, true, true) prepares to save', () => {
104+
test('onLoadedProject upload, with canSave true, prepares to save', () => {
138105
const initialState = {
139106
loadingState: LoadingState.LOADING_VM_FILE_UPLOAD
140107
};
@@ -143,38 +110,25 @@ test('onLoadedProject(LOADING_VM_FILE_UPLOAD, true, true) prepares to save', ()
143110
expect(resultState.loadingState).toBe(LoadingState.AUTO_UPDATING);
144111
});
145112

146-
test('onLoadedProject (LOADING_VM_FILE_UPLOAD, false, true) shows without id', () => {
113+
test('onLoadedProject with id shows with id', () => {
147114
const initialState = {
148-
loadingState: LoadingState.LOADING_VM_FILE_UPLOAD
149-
};
150-
const action = onLoadedProject(initialState.loadingState, false, true);
151-
const resultState = projectStateReducer(initialState, action);
152-
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITHOUT_ID);
153-
});
154-
155-
test('onLoadedProject (LOADING_VM_FILE_UPLOAD, false, false), with project id, shows with id', () => {
156-
const initialState = {
157-
loadingState: LoadingState.LOADING_VM_FILE_UPLOAD,
158-
projectId: '12345'
115+
loadingState: LoadingState.LOADING_VM_WITH_ID
159116
};
160-
const action = onLoadedProject(initialState.loadingState, false, false);
117+
const action = onLoadedProject(initialState.loadingState, true, true);
161118
const resultState = projectStateReducer(initialState, action);
162119
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITH_ID);
163120
});
164121

165-
test('onLoadedProject (LOADING_VM_FILE_UPLOAD, false, false), with no project id, shows without id', () => {
122+
test('onLoadedProject new shows without id', () => {
166123
const initialState = {
167-
loadingState: LoadingState.LOADING_VM_FILE_UPLOAD,
168-
projectId: null
124+
loadingState: LoadingState.LOADING_VM_NEW_DEFAULT
169125
};
170-
const action = onLoadedProject(initialState.loadingState, false, false);
126+
const action = onLoadedProject(initialState.loadingState, false, true);
171127
const resultState = projectStateReducer(initialState, action);
172128
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITHOUT_ID);
173129
});
174130

175-
// onLoadedProject: LOADING_VM_NEW_DEFAULT
176-
177-
test('onLoadedProject (LOADING_VM_NEW_DEFAULT, true, true) shows without id', () => {
131+
test('onLoadedProject new, to save shows without id', () => {
178132
const initialState = {
179133
loadingState: LoadingState.LOADING_VM_NEW_DEFAULT
180134
};
@@ -183,26 +137,26 @@ test('onLoadedProject (LOADING_VM_NEW_DEFAULT, true, true) shows without id', ()
183137
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITHOUT_ID);
184138
});
185139

186-
test('onLoadedProject (LOADING_VM_NEW_DEFAULT, false, true) shows without id', () => {
140+
test('onLoadedProject with success false, no project id, shows without id', () => {
187141
const initialState = {
188-
loadingState: LoadingState.LOADING_VM_NEW_DEFAULT
142+
loadingState: LoadingState.LOADING_VM_WITH_ID,
143+
projectId: null
189144
};
190-
const action = onLoadedProject(initialState.loadingState, false, true);
145+
const action = onLoadedProject(initialState.loadingState, false, false);
191146
const resultState = projectStateReducer(initialState, action);
192147
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITHOUT_ID);
193148
});
194149

195-
test('onLoadedProject (LOADING_VM_NEW_DEFAULT, false, false) shows error', () => {
150+
test('onLoadedProject with success false, valid project id, shows with id', () => {
196151
const initialState = {
197-
loadingState: LoadingState.LOADING_VM_NEW_DEFAULT
152+
loadingState: LoadingState.LOADING_VM_WITH_ID,
153+
projectId: '12345'
198154
};
199155
const action = onLoadedProject(initialState.loadingState, false, false);
200156
const resultState = projectStateReducer(initialState, action);
201-
expect(resultState.loadingState).toBe(LoadingState.ERROR);
157+
expect(resultState.loadingState).toBe(LoadingState.SHOWING_WITH_ID);
202158
});
203159

204-
// doneUpdatingProject
205-
206160
test('doneUpdatingProject with id shows with id', () => {
207161
const initialState = {
208162
loadingState: LoadingState.MANUAL_UPDATING

‎test/unit/util/project-saver-hoc.test.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('projectSaverHOC', () => {
5656
expect(mockedUpdateProject).toHaveBeenCalled();
5757
});
5858

59-
test('if canSave is already true and we show a project with an id, project will NOT be saved', () => {
59+
test('if canSave is alreatdy true and we show a project with an id, project will NOT be saved', () => {
6060
const mockedSaveProject = jest.fn();
6161
const Component = () => <div />;
6262
const WrappedComponent = projectSaverHOC(Component);

0 commit comments

Comments
 (0)