merge conflicts

Author: philbogle

Gemfile.lock

@@ -280,7 +280,6 @@ GEM
       rack (~> 1.2)
     oily_png (1.2.0)
       chunky_png (~> 1.3.1)
-    oj (2.12.11)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
@@ -413,11 +412,11 @@ GEM
       rdoc (~> 4.0, < 5.0)
     seamless_database_pool (1.0.14)
       activerecord (>= 3.0.20)
-    selenium-webdriver (2.47.1)
-      childprocess (~> 0.5)
+    selenium-webdriver (2.41.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0)
+      websocket (~> 1.0.4)
     sequel (4.10.0)
     sexp_processor (4.6.0)
     shotgun (0.9)

dashboard/app/models/workshop.rb

@@ -69,7 +69,6 @@ def phase_long_name
     phase_info[:long_name]
   end
 
-<<<<<<< HEAD
   def self.send_automated_emails
     [Workshop.workshops_in_2_weeks, Workshop.workshops_in_3_days, Workshop.workshops_ending_today].each do |workshop_list|
       workshop_list.each do |workshop|
@@ -78,17 +77,23 @@ def self.send_automated_emails
         facilitators = Workshop.find(workshop[:id]).facilitators
         [teachers, drop_ins, facilitators].each do |recipient_list|
           recipient_list.each do |recipient|
-            if workshop.segments.first.start.to_date == Date.today
-              logger.debug("Sending exit survey info to #{recipient.email}")
-              OpsMailer.exit_survey_information(workshop, recipient).deliver_now
+            if EmailValidator::email_address?(recipient.email)
+              if workshop.segments.first.start.to_date == Date.today
+                logger.debug("Sending exit survey info to #{recipient.email}")
+                OpsMailer.exit_survey_information(workshop, recipient).deliver_now
+              else
+                logger.debug("Sending email reminder to #{recipient.email}")
+                OpsMailer.workshop_reminder(workshop, recipient).deliver_now
+              end
             else
-              logger.debug("Sending email reminder to #{recipient.email}")
-              OpsMailer.workshop_reminder(workshop, recipient).deliver_now
+              logger.debug("Cannot send email to #{recipient.email} because it is not a valid email address")
             end
           end
         end
       end
-=======
+    end
+  end
+
   def prerequisite_phase
     return nil unless phase_info
     ActivityConstants::PHASES[phase_info[:prerequisite_phase]]
@@ -103,7 +108,6 @@ def send_reminders
       next unless EmailValidator::email_address?(recipient.email)
       logger.debug("Sending email reminder to #{recipient.email}")
       OpsMailer.workshop_reminder(self, recipient).deliver_now
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
     end
   end
 

dashboard/config/locales/dsls.en.yml

@@ -617,17 +617,6 @@ en:
         Unplugged intro: Unplugged intro
       PDK5 Why K5 CS:
         Why teach computer science in elementary school?: Why teach computer science in elementary school?
-<<<<<<< HEAD
-      Pixelation - Hadi Emoji:
-        Pixelation - Hadi Emoji: Pixelation - Hadi Emoji
-        description here: description here
-      Pixelation - Lesson 14 - Fix bit offset: {}
-      Pixelation - Lesson 14 - Fix bit offset v.2:
-        Pixelation - Lesson 14 - Fix bit offset v.2: Pixelation - Lesson 14 - Fix bit offset v.2
-      Pixelation - Lesson 14 - Fix the error:
-        Pixelation - Lesson 14 - Fix bit offset v.2: Pixelation - Lesson 14 - Fix bit offset v.2
-=======
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
       Pixelation - Lesson 14 - Instructions Make Your Own:
         Make your own B&W image: Make your own B&W image
         description here: description here
@@ -660,44 +649,6 @@ en:
       Pixelation - Video - Tips and Tricks:
         Pixelation - Video - Tips and Tricks: Pixelation - Video - Tips and Tricks
         description here: description here
-<<<<<<< HEAD
-      Pixelation 1:
-        Create images with bits and bytes.: Create images with bits and bytes.
-        Pixelation 1: Pixelation 1
-      Pixelation 2:
-        Create images with bits and bytes.: Create images with bits and bytes.
-        Pixelation 2: Pixelation 2
-      Pixelation 3:
-        Create images with bits and bytes.: Create images with bits and bytes.
-        Pixelation 3: Pixelation 3
-      Pixelation 3 Bit Colors:
-        description here: description here
-        title: title
-      Pixelation 4:
-        Create images with bits and bytes.: Create images with bits and bytes.
-        Pixelation 4 - Baker test of External level -- NOT REAL: Pixelation 4 - Baker test of External level -- NOT REAL
-      Pixelation 4x4 Empty:
-        Create images with bits and bytes.: Create images with bits and bytes.
-        Pixelation 4x4 Empty: Pixelation 4x4 Empty
-      Pixelation Bee:
-        description here: description here
-        title: title
-      Pixelation Flappy:
-        description here: description here
-        title: title
-      Test External Markdown: {}
-      Test discourse forum-comment level:
-        Degree of Difficulty: Degree of Difficulty
-        Was programming as hard as you expected? Explain why or why not. How does this impact your teaching of computer science?: Was programming as hard as you expected? Explain why or why not. How does this impact your teaching of computer science?
-      Text Compression 1:
-        Compress text by identifying repeated patterns.: Compress text by identifying repeated patterns.
-        Text Compression 1: Text Compression 1
-      Text Compression Peter Piper:
-        Compress text by identifying repeated patterns.: Compress text by identifying repeated patterns.
-        Text Compression Peter Piper: Text Compression Peter Piper
-      U1L1 Innovation - Video: {}
-      U1L1 Student Lesson Introduction: {}
-=======
       TLO intro:
         Introduction to the TLO: Introduction to the TLO
       TLO practical:
@@ -713,7 +664,6 @@ en:
       U1L1 Student Lesson Introduction:
         Impact of Innovation: Impact of Innovation
         description here: description here
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
       U1L10 Student Lesson Introduction:
         description here: description here
         title: title
@@ -723,20 +673,15 @@ en:
       U1L12 Student Lesson Introduction:
         description here: description here
         title: title
-<<<<<<< HEAD
-      U1L13 Student Lesson Summary: {}
-      U1L13 Text Compression:
-        Compress text by identifying repeated patterns.: Compress text by identifying repeated patterns.
-        U1L13 Text Compression: U1L13 Text Compression
-=======
       U1L13 Student Lesson Summary:
         description here: description here
         title: title
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
       U1L14 Student Lesson Summary:
         description here: description here
         title: title
-      U1L15 Student Lesson Summary: {}
+      U1L15 Student Lesson Summary:
+        description here: description here
+        title: title
       U1L16 Student Lesson Introduction:
         Lossy Compression and File Formats: Lossy Compression and File Formats
         description here: description here
@@ -755,8 +700,12 @@ en:
       U1L4 Widget Demo - Video:
         Widget Demonstration - Video: Widget Demonstration - Video
         description here: description here
-      U1L5 How the Internet Works - Video: {}
-      U1L5 Student Lesson Introduction: {}
+      U1L5 How the Internet Works - Video:
+        How the Internet Works - Video: How the Internet Works - Video
+        description here: description here
+      U1L5 Student Lesson Introduction:
+        description here: description here
+        title: title
       U1L6 Student Lesson Introduction:
         description here: description here
         title: title
@@ -766,9 +715,6 @@ en:
       U1L8 Student Lesson Introduction:
         Sending Numbers: Sending Numbers
         description here: description here
-<<<<<<< HEAD
-      U1L9 Student Lesson Introduction: {}
-=======
       U1L9 Student Lesson Introduction:
         description here: description here
         title: title
@@ -781,7 +727,6 @@ en:
       'U2 The Internet: Cybersecurity and Crime - Video':
         'The Internet: Cybersecurity and Crime - Video': 'The Internet: Cybersecurity and Crime - Video'
         description here: description here
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
       U2L1 Student Lesson Introduction:
         description here: description here
         title: title
@@ -946,10 +891,12 @@ en:
       U3L24 Return Statements Lecture: {}
       U3L24 Student Lesson Introduction:
         Chained Conditionals: Chained Conditionals
-      U3L25 Student Lesson Introduction: {}
+      U3L25 Student Lesson Introduction:
+        Compound Conditionals: Compound Conditionals
       U3L26 Student Lesson Introduction:
         Strings and Substrings: Strings and Substrings
-      U3L27 Student Lesson Introduction: {}
+      U3L27 Student Lesson Introduction:
+        Digital Assistant Challenge: Digital Assistant Challenge
       U3L28 Student Lesson Introduction:
         While Loop Basics: While Loop Basics
       U3L29 Student Lesson Introduction:
@@ -964,9 +911,6 @@ en:
         'Arrays and Loops: Altering Images': 'Arrays and Loops: Altering Images'
       U3L34 Student Lesson Introduction:
         'Arrays and Loops: Hidden Images': 'Arrays and Loops: Hidden Images'
-<<<<<<< HEAD
-      a bit about pixels: {}
-=======
       U4 Inspirational Data Video: {}
       U4L01 Student Lesson Introduction:
         description here: description here
@@ -1044,7 +988,6 @@ en:
       a bit about pixels:
         kevin systrom pixel video: kevin systrom pixel video
         pixel video: pixel video
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
       broadcast lesson plan: {}
       challenges sample:
         Give these a try: Give these a try
@@ -4114,7 +4057,13 @@ en:
         Convert Blocks to Math: Convert Blocks to Math
         Type out the arithmetic expression that matches this code: Type out the arithmetic expression that matches this code
         Type the arithmetic expression here: Type the arithmetic expression here
-      Blocks to Math 1: {}
+      Blocks to Math 1:
+        (4+5): (4+5)
+        4 + 5: 4 + 5
+        Blocks to Math 1.blocks.start_blocks, 200: Blocks to Math 1.blocks.start_blocks, 200
+        Convert Blocks to Math: Convert Blocks to Math
+        Type out the arithmetic expression that matches this code: Type out the arithmetic expression that matches this code
+        Type the arithmetic expression here: Type the arithmetic expression here
       Blocks to Math 2:
         (7 * 6): (7 * 6)
         7 * 6: 7 * 6
@@ -4329,7 +4278,10 @@ en:
       U1L12 Reflection Free Response:
         'Reflection: Data Storage': 'Reflection: Data Storage'
         Respond to this prompt or to another as directed by your teacher.: Respond to this prompt or to another as directed by your teacher.
-      U1L13 - Assess Text Compression reverse process: {}
+      U1L13 - Assess Text Compression reverse process:
+        Act as the computer!: Act as the computer!
+        the big bug bit the bull but the bull bit the big bug back: the big bug bit the bull but the bull bit the big bug back
+        the_big_bug_bit_the_bull_but_the_bull_bit_the_big_bug_back: the_big_bug_bit_the_bull_but_the_bull_bit_the_big_bug_back
       U1L13 Assess Text Compression amount:
         Is this a good compression rate?: Is this a good compression rate?
       U1L13 Assessment 1:
@@ -4669,10 +4621,14 @@ en:
         'String and Substring: Getting Started': 'String and Substring: Getting Started'
       U3L26 Free Response Wrap Up:
         'String and Substring: Assessment 1': 'String and Substring: Assessment 1'
-      U3L27 Assessment1: {}
-      U3L27 Assessment2: {}
-      U3L27 Assessment3: {}
-      U3L27 Free Response Getting Started: {}
+      U3L27 Assessment1:
+        Digital Assistant Reflection 1: Digital Assistant Reflection 1
+      U3L27 Assessment2:
+        Digital Assistant Reflection 2: Digital Assistant Reflection 2
+      U3L27 Assessment3:
+        'Digital Assistant Reflection 3 ': 'Digital Assistant Reflection 3 '
+      U3L27 Free Response Getting Started:
+        'Digital Assistant: Getting Started': 'Digital Assistant: Getting Started'
       U3L28 Free Response Getting Started:
         'While Loops Basics: Getting Started': 'While Loops Basics: Getting Started'
       U3L28 Free Response Wrap Up:

dashboard/db/schema.rb

@@ -526,20 +526,12 @@
 
   create_table "workshops", force: :cascade do |t|
     t.string   "name",         limit: 255
-<<<<<<< HEAD
-    t.string   "program_type", limit: 255,   null: false
-=======
     t.string   "program_type", limit: 255, null: false
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
     t.string   "location",     limit: 255
     t.string   "instructions", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-<<<<<<< HEAD
-    t.text     "phase",        limit: 65535
-=======
     t.integer  "phase",        limit: 4
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
   end
 
   add_index "workshops", ["name"], name: "index_workshops_on_name", using: :btree

dashboard/test/controllers/activities_controller_test.rb

@@ -5,10 +5,7 @@
 class ActivitiesControllerTest < ActionController::TestCase
   include Devise::TestHelpers
   include LevelsHelper
-<<<<<<< HEAD
-=======
   include UsersHelper
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
   include Mocha::API
 
   setup do
@@ -165,15 +162,9 @@ def expect_controller_logs_milestone_regexp(regexp)
       log_string !~ regexp
     end
   end
-<<<<<<< HEAD
 
-  test "logged in milestone does not allow negative lines of code" do
-
-=======
 
   test "logged in milestone does not allow negative lines of code" do
-
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
     expect_controller_logs_milestone_regexp(/-20/)
     @controller.expects :slog
 
@@ -227,7 +218,6 @@ def expect_controller_logs_milestone_regexp(regexp)
     assert_equal 1000, Activity.last.lines
   end
 
-<<<<<<< HEAD
   test "anonymous milestone does not allow unreasonably high lines of code" do
     sign_out(@user)
 
@@ -257,8 +247,6 @@ def expect_controller_logs_milestone_regexp(regexp)
     assert_equal_expected_keys expected_response, JSON.parse(@response.body)
   end
 
-=======
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
   test "logged in milestone with messed up email" do
     # use update_attribute to bypass validations
     @user.update_attribute(:email, '')

deployment.rb

@@ -78,11 +78,7 @@ def load_configuration()
     'ruby_installer'              => rack_env == :development ? 'rbenv' : 'system',
     'root_dir'                    => root_dir,
     'use_dynamo_tables'           => [:staging, :adhoc, :test, :production].include?(rack_env),
-<<<<<<< HEAD
-    'use_dynamo_properties'       => [:staging, :adhoc, :test, :production].include?(rack_env),
-=======
     #'use_dynamo_properties'       => [:staging, :adhoc, :test, :production].include?(rack_env),
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
     'dynamo_tables_table'         => "#{rack_env}_tables",
     'dynamo_tables_index'         => "channel_id-table_name-index",
     'use_dynamo_properties'       => false,

shared/test/test_properties.rb

@@ -7,17 +7,14 @@
 ENV['RACK_ENV'] = 'test'
 
 class PropertiesTest < Minitest::Test
-<<<<<<< HEAD
-
   def test_get_set_delete
     # The Properties API does not need to share a cookie jar with the Channels API.
     @channels = Rack::Test::Session.new(Rack::MockSession.new(ChannelsApi, "studio.code.org"))
     @properties = Rack::Test::Session.new(Rack::MockSession.new(PropertiesApi, "studio.code.org"))
+  end
 
-=======
   def setup
     init_apis
->>>>>>> 579475b7d60f9ac88208dddc731de8f007c5f3cb
     create_channel
   end