DTL (Test > Levelbuilder): 8e817008

Gemfile

@@ -104,14 +104,14 @@ group :development, :test do
   # For UI testing.
   gem 'chromedriver-helper', '~> 0.0.7'
   gem 'cucumber'
-  gem 'eyes_selenium', '3.14.2'
+  gem 'eyes_selenium'
   gem 'minitest', '~> 5.5'
   gem 'minitest-around'
   gem 'minitest-reporters', '~> 1.2.0.beta3'
   gem 'net-http-persistent'
   gem 'rinku'
   gem 'rspec'
-  gem 'selenium-webdriver', '3.8.0'
+  gem 'selenium-webdriver'
   gem 'spring'
   gem 'spring-commands-testunit'
 
@@ -185,7 +185,7 @@ gem 'haml', github: 'wjordan/haml', ref: 'cdo'
 
 gem 'jquery-ui-rails', '~> 6.0.1'
 
-gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '>= 1.10.0'
 
 gem 'highline', '~> 1.6.21'
 

Gemfile.lock

@@ -337,14 +337,7 @@ GEM
     brakeman (4.3.1)
     builder (3.2.3)
     cancancan (1.15.0)
-    capybara (2.17.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (0.0.9)
       archive-zip (~> 0.7.0)
@@ -370,6 +363,8 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
+    css_parser (1.7.0)
+      addressable
     cucumber (3.1.1)
       builder (>= 2.1.2)
       cucumber-core (~> 3.1.0)
@@ -410,16 +405,15 @@ GEM
     eventmachine (1.2.5)
     execjs (2.7.0)
     exifr (1.2.5)
-    eyes_core (3.14.2)
+    eyes_core (3.14.10)
       chunky_png (= 1.3.6)
       faraday
       oily_png (~> 1.2)
       oj
-    eyes_selenium (3.14.2)
-      capybara
-      eyes_core (= 3.14.2)
+    eyes_selenium (3.14.10)
+      css_parser
+      eyes_core (= 3.14.10)
       selenium-webdriver
-      watir
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
@@ -543,7 +537,7 @@ GEM
     mime-types-data (3.2018.0812)
     mini_magick (4.5.1)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     minitest-around (0.4.1)
       minitest (~> 5.0)
@@ -562,15 +556,16 @@ GEM
     mysql2 (0.5.2)
     nakayoshi_fork (0.0.4)
     naturally (2.1.0)
-    net-http-persistent (2.9.4)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     netrc (0.11.0)
     newrelic_rpm (4.8.0.341)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     oauth (0.5.1)
     oauth2 (1.4.1)
       faraday (>= 0.8, < 0.16.0)
@@ -765,9 +760,9 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (3.8.0)
+    selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.0)
+      rubyzip (~> 1.2, >= 1.2.2)
     sequel (5.9.0)
     sexp_processor (4.10.1)
     shotgun (0.9.1)
@@ -850,8 +845,6 @@ GEM
     vcr (3.0.3)
     warden (1.2.7)
       rack (>= 1.0)
-    watir (6.10.3)
-      selenium-webdriver (~> 3.4, >= 3.4.1)
     web-console (3.3.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -868,8 +861,6 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
     xxhash (0.4.0)
     youtube-dl.rb (0.3.1.2016.08.19)
       cocaine (>= 0.5.4)
@@ -920,7 +911,7 @@ DEPENDENCIES
   devise (~> 4.4.0)
   devise_invitable (~> 1.6.0)
   execjs
-  eyes_selenium (= 3.14.2)
+  eyes_selenium
   factory_girl_rails
   fake_sqs
   fakeredis
@@ -970,7 +961,7 @@ DEPENDENCIES
   net-scp
   net-ssh
   newrelic_rpm (~> 4.8.0)
-  nokogiri (~> 1.8.2)
+  nokogiri (>= 1.10.0)
   octokit
   oj
   omniauth-clever (~> 1.2.1)!
@@ -1021,7 +1012,7 @@ DEPENDENCIES
   scss_lint
   sdoc
   seamless_database_pool!
-  selenium-webdriver (= 3.8.0)
+  selenium-webdriver
   sequel
   shotgun
   simplecov (~> 0.9)

apps/src/code-studio/components/progress/ViewAsToggle.jsx

@@ -4,7 +4,7 @@ import React from 'react';
 import {connect} from 'react-redux';
 import commonMsg from '@cdo/locale';
 import ToggleGroup from '@cdo/apps/templates/ToggleGroup';
-import {ViewType, setViewType} from '../../viewAsRedux';
+import {ViewType, changeViewType} from '../../viewAsRedux';
 import {queryParams, updateQueryParam} from '@cdo/apps/code-studio/utils';
 
 const styles = {
@@ -27,7 +27,7 @@ const styles = {
 class ViewAsToggle extends React.Component {
   static propTypes = {
     viewAs: PropTypes.oneOf(Object.values(ViewType)).isRequired,
-    setViewType: PropTypes.func.isRequired
+    changeViewType: PropTypes.func.isRequired
   };
 
   componentDidMount() {
@@ -38,12 +38,12 @@ class ViewAsToggle extends React.Component {
   }
 
   onChange = viewType => {
-    const {setViewType} = this.props;
+    const {changeViewType} = this.props;
 
     updateQueryParam('viewAs', viewType);
 
     if (viewType === ViewType.Student && queryParams('user_id')) {
-      // In this case, the setViewType thunk is going to do a reload and we dont
+      // In this case, the changeViewType thunk is going to do a reload and we dont
       // want to change our UI.
     } else {
       // Ideally all the things we would want to hide would be redux backed, and
@@ -52,7 +52,7 @@ class ViewAsToggle extends React.Component {
       $('.hide-as-student').toggle(viewType === ViewType.Teacher);
     }
 
-    setViewType(viewType);
+    changeViewType(viewType);
   };
 
   render() {
@@ -90,8 +90,8 @@ export default connect(
     viewAs: state.viewAs
   }),
   dispatch => ({
-    setViewType(viewAs) {
-      dispatch(setViewType(viewAs));
+    changeViewType(viewAs) {
+      dispatch(changeViewType(viewAs));
     }
   })
 )(UnconnectedViewAsToggle);

apps/src/code-studio/progress.js

@@ -150,6 +150,11 @@ progress.renderStageProgress = function(
 progress.renderCourseProgress = function(scriptData) {
   const store = getStore();
   initializeStoreWithProgress(store, scriptData, null, true);
+
+  if (scriptData.student_detail_progress_view) {
+    store.dispatch(setStudentDefaultsSummaryView(false));
+  }
+  initViewAs(store, scriptData);
   queryUserProgress(store, scriptData, null);
 
   const teacherResources = (scriptData.teacher_resources || []).map(
@@ -213,24 +218,22 @@ progress.renderMiniView = function(
   });
 };
 
-/**
- * Query the server for user_progress data for this script, and update the store
- * as appropriate
- */
-function queryUserProgress(store, scriptData, currentLevelId) {
-  const onOverviewPage = !currentLevelId;
-
-  if (scriptData.student_detail_progress_view) {
-    store.dispatch(setStudentDefaultsSummaryView(false));
-  }
-
+function initViewAs(store, scriptData) {
   // Set our initial view type from current user's user_type or our query string.
   let initialViewAs = ViewType.Student;
   if (scriptData.user_type === 'teacher') {
     const query = queryString.parse(location.search);
     initialViewAs = query.viewAs || ViewType.Teacher;
   }
   store.dispatch(setViewType(initialViewAs));
+}
+
+/**
+ * Query the server for user_progress data for this script, and update the store
+ * as appropriate
+ */
+function queryUserProgress(store, scriptData, currentLevelId) {
+  const onOverviewPage = !currentLevelId;
 
   $.ajax('/api/user_progress/' + scriptData.name, {
     data: {
@@ -271,15 +274,6 @@ function queryUserProgress(store, scriptData, currentLevelId) {
 
       store.dispatch(showTeacherInfo());
 
-      const viewAs =
-        queryString.parse(location.search).viewAs || ViewType.Teacher;
-      if (viewAs !== initialViewAs) {
-        // We don't want to redispatch if our viewAs is the same as the initial
-        // one, since the user might have manually changed the view while making
-        // our async call
-        store.dispatch(setViewType(viewAs));
-      }
-
       renderTeacherPanel(store, scriptData.id, scriptData.section);
     }
 

apps/src/code-studio/viewAsRedux.js

@@ -11,9 +11,6 @@ export const ViewType = makeEnum('Student', 'Teacher');
 // Action types
 export const SET_VIEW_TYPE = 'viewAs/SET_VIEW_TYPE';
 
-/**
- * Stage lock reducer
- */
 export default function reducer(state = ViewType.Student, action) {
   if (action.type === SET_VIEW_TYPE) {
     const viewType = action.viewType;
@@ -29,13 +26,12 @@ export default function reducer(state = ViewType.Student, action) {
 
 // Action creators
 
-// Exported for test purposes
-export const setViewTypeNonThunk = viewType => ({
+export const setViewType = viewType => ({
   type: SET_VIEW_TYPE,
   viewType
 });
 
-export const setViewType = viewType => {
+export const changeViewType = viewType => {
   return dispatch => {
     // If changing to viewAs student while we are a particular student, remove
     // the user_id and do a reload so that we're instead viewing as a generic
@@ -47,6 +43,6 @@ export const setViewType = viewType => {
       return;
     }
 
-    dispatch(setViewTypeNonThunk(viewType));
+    dispatch(setViewType(viewType));
   };
 };