@instructure/outcomes-ui 2.1.4 → 2.1.6

package/lib/translated/zh-Hans/services/__tests__/OutcomesService.test.js

@@ -164,20 +164,20 @@ describe('OutcomesService', function () {
     };
     it('uses correct query', function () {
       _fetchMock.default.getOnce(function (url, opts) {
-        (0, _chai.expect)(url).to.match(/\/artifact\?artifact_id=1&artifact_type=quizzes.quiz$/);
+        (0, _chai.expect)(url).to.match(/\/artifact\?artifact_id=1&artifact_type=quizzes.quiz&includes=friendly_description$/);
         return true;
       }, []);
 
       return subject.getArtifact(host, jwt, artifact.artifact_type, artifact.artifact_id);
     });
     it('resolves with json on success', function () {
-      mockGet('/api/artifact?artifact_id=1&artifact_type=quizzes.quiz', artifact);
+      mockGet('/api/artifact?artifact_id=1&artifact_type=quizzes.quiz&includes=friendly_description', artifact);
       return subject.getArtifact(host, jwt, artifact.artifact_type, artifact.artifact_id).then(function (result) {
         (0, _chai.expect)(result).to.deep.equal(artifact.alignment_set);
       });
     });
     it('rejects on error', function () {
-      mockGet('/api/artifact?artifact_id=1&artifact_type=quizzes.quiz', 500);
+      mockGet('/api/artifact?artifact_id=1&artifact_type=quizzes.quiz&includes=friendly_description', 500);
       return subject.getArtifact(host, jwt, artifact.artifact_type, artifact.artifact_id).catch(function (err) {
         (0, _chai.expect)(err).to.have.property('status', 500);
       });
@@ -452,7 +452,7 @@ describe('OutcomesService', function () {
   describe('getSearchResults', function () {
     it('uses correct query', function () {
       _fetchMock.default.getOnce(function (url, opts) {
-        (0, _chai.expect)(url).to.match(/\/outcomes\/search\?context_uuid=def&page=999&text=abc$/);
+        (0, _chai.expect)(url).to.match(/\/outcomes\/search\?context_uuid=def&includes\[\]=scoring_method&includes\[\]=friendly_description&page=999&text=abc$/);
         return true;
       }, []);
 
@@ -476,7 +476,7 @@ describe('OutcomesService', function () {
       var headers = {
         total: 101
       };
-      mockGet('/api/outcomes/search?context_uuid=def&page=999&text=abc', {
+      mockGet('/api/outcomes/search?context_uuid=def&includes[]=scoring_method&includes[]=friendly_description&page=999&text=abc', {
         body: body,
         headers: headers
       });
@@ -487,7 +487,7 @@ describe('OutcomesService', function () {
       });
     });
     it('rejects on error', function () {
-      mockGet('/api/outcomes/search?context_uuid=def&page=999&text=abc', 500);
+      mockGet('/api/outcomes/search?context_uuid=def&includes[]=scoring_method&includes[]=friendly_description&page=999&text=abc', 500);
       return subject.getSearchResults(host, jwt, 'abc', 999, 'def').catch(function (err) {
         (0, _chai.expect)(err).to.have.property('status', 500);
       });
@@ -496,7 +496,7 @@ describe('OutcomesService', function () {
   describe('listOutcomes', function () {
     it('uses correct query', function () {
       _fetchMock.default.getOnce(function (url, opts) {
-        var exp_url = /\/outcomes\/list\?artifact_id=103&artifact_type=quizzes\.quiz&context_uuid=def&includes=scoring_method&page=999&per_page=10$/;
+        var exp_url = /\/outcomes\/list\?artifact_id=103&artifact_type=quizzes\.quiz&context_uuid=def&includes\[\]=scoring_method&includes\[\]=friendly_description&page=999&per_page=10$/;
         (0, _chai.expect)(url).to.match(exp_url);
         return true;
       }, []);
@@ -516,7 +516,7 @@ describe('OutcomesService', function () {
       var headers = {
         total: 101
       };
-      var url = '/api/outcomes/list?context_uuid=def&includes=scoring_method&page=999&per_page=10';
+      var url = '/api/outcomes/list?context_uuid=def&includes[]=scoring_method&includes[]=friendly_description&page=999&per_page=10';
       mockGet(url, {
         body: body,
         headers: headers
@@ -529,7 +529,7 @@ describe('OutcomesService', function () {
       });
     });
     it('rejects on error', function () {
-      var url = '/api/outcomes/list?artifact_id=103&artifact_type=quizzes.quiz&context_uuid=def&includes=scoring_method&page=999&per_page=10';
+      var url = '/api/outcomes/list?artifact_id=103&artifact_type=quizzes.quiz&context_uuid=def&includes[]=scoring_method&includes[]=friendly_description&page=999&per_page=10';
       mockGet(url, 500);
       return subject.listOutcomes(host, jwt, 999, 'def', '103', 'quizzes.quiz').catch(function (err) {
         (0, _chai.expect)(err).to.have.property('status', 500);
@@ -548,7 +548,7 @@ describe('OutcomesService', function () {
       var headers = {
         total: 101
       };
-      var url = '/api/outcomes/list?artifact_id=103&artifact_type=quizzes.quiz&context_uuid=def&includes=scoring_method&page=999&per_page=10';
+      var url = '/api/outcomes/list?artifact_id=103&artifact_type=quizzes.quiz&context_uuid=def&includes[]=scoring_method&includes[]=friendly_description&page=999&per_page=10';
       mockGet(url, {
         body: body,
         headers: headers

package/lib/translated/zh-Hans/store/report/__tests__/actions.test.js

@@ -137,7 +137,12 @@ describe('report/actions', function () {
       var state = {
         scopeForTest: {
           report: {
-            users: users
+            page: {
+              number: 0
+            },
+            users: {
+              '0': users
+            }
           }
         }
       };
@@ -165,11 +170,14 @@ describe('report/actions', function () {
         });
         var resultActions = store.getActions().slice(-2);
         resultActions.forEach(function (act) {
-          var outcomeId = act.payload.outcomeId;
+          var _act$payload = act.payload,
+              outcomeId = _act$payload.outcomeId,
+              seenResults = _act$payload.seenResults;
           var results = fakeResults[outcomeId];
           (0, _chai.expect)(act).to.deep.equal(scopedActions.setResults({
             outcomeId: outcomeId,
-            results: results
+            results: results,
+            seenResults: seenResults
           }));
         });
         return null;
@@ -202,12 +210,25 @@ describe('report/actions', function () {
   });
   describe('loadPage', function () {
     it('changes the page, then loads users / score data', function () {
-      var store = (0, _createMockStore.default)((0, _immutable.Map)(), service);
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {}
+          }
+        }
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
       return store.dispatch(actions.loadPage('quiz', 101, 2)).then(function () {
         (0, _chai.expect)(store.getActions()).to.deep.include.members([(0, _multireducer.wrapAction)(actions.setPage({
           number: 2,
           loading: true
-        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setUsers(users), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setRollups(rollups), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setPage({
+        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setUsers({
+          2: users
+        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setRollups(rollups), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setPage({
           number: 2,
           loading: false
         }), 'scopeForTest')]);
@@ -221,7 +242,8 @@ describe('report/actions', function () {
             page: {
               number: 10,
               loading: false
-            }
+            },
+            users: {}
           }
         }
       };
@@ -230,7 +252,9 @@ describe('report/actions', function () {
         (0, _chai.expect)(store.getActions()).to.deep.include.members([(0, _multireducer.wrapAction)(actions.setPage({
           number: 10,
           loading: true
-        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setUsers(users), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setRollups(rollups), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setPage({
+        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setUsers({
+          10: users
+        }), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setRollups(rollups), 'scopeForTest'), (0, _multireducer.wrapAction)(actions.setPage({
           number: 10,
           loading: false
         }), 'scopeForTest')]);
@@ -244,6 +268,10 @@ describe('report/actions', function () {
             page: {
               number: 5,
               loading: true
+            },
+            users: {
+              1: [],
+              2: []
             }
           }
         }
@@ -255,12 +283,24 @@ describe('report/actions', function () {
       });
     });
     it('dispatches setUsers / setPageData on outcome service success', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1
+            },
+            users: {}
+          }
+        }
+      };
       var service = {
         getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
       };
-      var store = (0, _createMockStore.default)((0, _immutable.Map)(), service);
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
       return store.dispatch(actions.loadPage('quiz', 101, 2)).then(function () {
-        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setUsers(getUsersResponse.users));
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setUsers({
+          2: getUsersResponse.users
+        }));
         (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setPageData({
           perPage: 50,
           total: 2
@@ -269,13 +309,25 @@ describe('report/actions', function () {
       });
     });
     it('dispatches setError on outcome service failure', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1
+            },
+            users: {
+              1: []
+            }
+          }
+        }
+      };
       var error = {
         message: 'foo bar baz'
       };
       var service = {
         getUsers: _sinon.default.stub().returns(Promise.reject(error))
       };
-      var store = (0, _createMockStore.default)((0, _immutable.Map)(), service);
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
       return store.dispatch(actions.loadPage('quiz', 101, 2)).then(function () {
         (0, _chai.expect)(store.getActions()).to.have.length(4);
         (0, _chai.expect)(store.getActions()[3]).to.deep.equal(scopedActions.setError(error));
@@ -283,13 +335,25 @@ describe('report/actions', function () {
       });
     });
     it('dispatches an alternative loadUsers function if specified', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1
+            },
+            users: {
+              1: []
+            }
+          }
+        }
+      };
       var service = {
         getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
       };
 
       var loadUsers = _sinon.default.stub().returns(Promise.resolve());
 
-      var store = (0, _createMockStore.default)((0, _immutable.Map)(), service);
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
       return store.dispatch(actions.loadPage('quiz', 101, 2, loadUsers)).then(function () {
         (0, _chai.expect)(service.getUsers).not.to.have.been.called;
         (0, _chai.expect)(loadUsers).to.have.been.calledOnce;
@@ -309,4 +373,340 @@ describe('report/actions', function () {
       });
     });
   });
+  describe('loadRemainingPages', function () {
+    it('starts loading remaining pages if we are not already loading them', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingPages('quiz', 101)).then(function () {
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setLoadingRemainingPages(_constants.IN_PROGRESS));
+      });
+    });
+    it('does not load remaining pages if we are already loading them', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            loadingRemainingPages: _constants.IN_PROGRESS,
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingPages('quiz', 101)).then(function () {
+        (0, _chai.expect)(store.getActions()).not.to.deep.include(scopedActions.setLoadingRemainingPages(_constants.IN_PROGRESS));
+      });
+    });
+    it('loads the remaining pages from the current page if there was an error while fetching last time', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            loadingRemainingPages: _constants.ERROR,
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users,
+              2: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingPages('quiz', 101)).then(function () {
+        (0, _chai.expect)(service.getUsers).to.have.callCount(3);
+      });
+    });
+    it('sets loadRemainingPages as fetching_error if an error is thrown while fetching users', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            loadingRemainingPages: _constants.NOT_FETCHING,
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.reject({
+          message: 'error!'
+        }))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingPages('quiz', 101)).then(function () {
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setLoadingRemainingPages(_constants.ERROR));
+        (0, _chai.expect)(store.getActions()).not.to.deep.include(scopedActions.setLoadingRemainingPages(_constants.COMPLETED));
+      });
+    });
+    it('sets loadRemainingPages as fetching_error if an error is thrown while fetching results', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            loadingRemainingPages: _constants.NOT_FETCHING,
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse)),
+        getOutcomeResults: _sinon.default.stub().returns(Promise.reject({
+          message: 'error!'
+        }))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingPages('quiz', 101)).then(function () {
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setLoadingRemainingPages(_constants.ERROR));
+        (0, _chai.expect)(store.getActions()).not.to.deep.include(scopedActions.setLoadingRemainingPages(_constants.COMPLETED));
+      });
+    });
+  });
+  describe('loadRemainingUsers', function () {
+    it('calls outcomes service for each remaining page and sets the users', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            }
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.resolve(getUsersResponse))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingUsers('quiz', 101, 2, 3)).then(function () {
+        (0, _chai.expect)(service.getUsers).to.have.been.calledTwice;
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setUsers({
+          1: users,
+          2: getUsersResponse.users
+        }));
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setUsers({
+          1: users,
+          3: getUsersResponse.users
+        }));
+      });
+    });
+    it('sets loadRemainingPages as fetching_error if an error is thrown while fetching', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            loadingRemainingPages: _constants.IN_PROGRESS,
+            page: {
+              number: 1,
+              loading: false
+            },
+            users: {
+              1: users
+            },
+            pageData: {
+              total: 6,
+              perPage: 2
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var service = {
+        getUsers: _sinon.default.stub().returns(Promise.reject({
+          message: 'error!'
+        }))
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.fromJS)(state), service);
+      return store.dispatch(actions.loadRemainingUsers('quiz', 101, 2, 3)).then(function () {
+        (0, _chai.expect)(store.getActions()).to.deep.include(scopedActions.setLoadingRemainingPages(_constants.ERROR));
+      });
+    });
+  });
+  describe('loadRemainingResults', function () {
+    it('calls outcome service for each remaining page and rollups and sets the results', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.Map)((0, _immutable.fromJS)(state)), service);
+      return store.dispatch(actions.loadRemainingResults('quiz', 101, 2, 3)).then(function () {
+        var resultActions = store.getActions().slice(-5);
+        var completeAction = resultActions.pop();
+        resultActions.forEach(function (act) {
+          var _act$payload2 = act.payload,
+              outcomeId = _act$payload2.outcomeId,
+              seenResults = _act$payload2.seenResults;
+          var results = fakeResults[outcomeId];
+          (0, _chai.expect)(act).to.deep.equal(scopedActions.setResults({
+            outcomeId: outcomeId,
+            results: results,
+            seenResults: seenResults
+          }));
+        });
+        (0, _chai.expect)(completeAction).to.deep.equal(scopedActions.setLoadingRemainingPages(_constants.COMPLETED));
+      });
+    });
+  });
+  describe('getUserList', function () {
+    it('returns a list of user uuids from page 1', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users,
+              2: getUsersResponse.users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      (0, _chai.expect)(actions.getUserList((0, _immutable.fromJS)(state), 'scopeForTest', 1)).to.deep.eq(users.map(function (user) {
+        return user.uuid;
+      }));
+    });
+    it('returns a list of user uuids from page 2', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users,
+              2: getUsersResponse.users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      (0, _chai.expect)(actions.getUserList((0, _immutable.fromJS)(state), 'scopeForTest', 2)).to.deep.eq(getUsersResponse.users.map(function (user) {
+        return user.uuid;
+      }));
+    });
+  });
+  describe('getPaginatedUserList', function () {
+    it('returns a paginated list of all users', function () {
+      var users1 = users.map(function (user) {
+        return user.uuid;
+      });
+      var users2 = getUsersResponse.users.map(function (user) {
+        return user.uuid;
+      });
+      var allUsers = [users1, users2];
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users,
+              2: getUsersResponse.users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      (0, _chai.expect)(actions.getPaginatedUserList((0, _immutable.fromJS)(state), 'scopeForTest', 1, 2)).to.deep.eq(allUsers);
+    });
+    it('returns a paginated list of a subset of users', function () {
+      var users2 = getUsersResponse.users.map(function (user) {
+        return user.uuid;
+      });
+      var users3 = users.map(function (user) {
+        return user.uuid;
+      });
+      var allUsers = [users2, users3];
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users,
+              2: getUsersResponse.users,
+              3: users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      (0, _chai.expect)(actions.getPaginatedUserList((0, _immutable.fromJS)(state), 'scopeForTest', 2, 3)).to.deep.eq(allUsers);
+    });
+  });
 });

package/lib/translated/zh-Hans/store/report/__tests__/reducers.test.js

@@ -74,18 +74,44 @@ describe('reports/reducers', function () {
       var result = {
         user_uuid: user_uuid,
         points: 95.0,
-        points_possible: 100
+        points_possible: 100,
+        attempt: 1
       };
       var newResults = {
         outcomeId: '1955',
-        results: [result]
+        results: [result],
+        seenResults: new Map()
       };
       var newState = (0, _reducers.default)(state, (0, _actions.setResults)(newResults));
       (0, _chai.expect)(newState.getIn(['results', '1955', user_uuid.toString()]).toJS()).to.deep.equal({
         userId: user_uuid,
         percentScore: result.percent_score,
         points: result.points,
-        pointsPossible: result.points_possible
+        pointsPossible: result.points_possible,
+        attempt: result.attempt
+      });
+    });
+    it('retains seenResults when updated', function () {
+      var seenResult = {
+        userId: 'old_user',
+        points: 90.0,
+        pointsPossible: 100
+      };
+      var result = {
+        user_uuid: user_uuid,
+        points: 95.0,
+        points_possible: 100
+      };
+      var newResults = {
+        outcomeId: '1955',
+        results: [result],
+        seenResults: new Map([[seenResult.userId, seenResult]])
+      };
+      var newState = (0, _reducers.default)(state, (0, _actions.setResults)(newResults));
+      (0, _chai.expect)(newState.getIn(['results', '1955', seenResult.userId])).to.deep.equal({
+        userId: seenResult.userId,
+        points: seenResult.points,
+        pointsPossible: seenResult.pointsPossible
       });
     });
   });
@@ -101,11 +127,13 @@ describe('reports/reducers', function () {
   });
   describe('users', function () {
     it('is updated by setUsers', function () {
-      var newUsers = [{
-        uuid: '200'
-      }, {
-        uuid: '300'
-      }];
+      var newUsers = {
+        0: [{
+          uuid: '200'
+        }, {
+          uuid: '300'
+        }]
+      };
       var newState = (0, _reducers.default)(state, (0, _actions.setUsers)(newUsers));
       (0, _chai.expect)(newState.get('users').toJS()).to.deep.equal(newUsers);
     });