Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test

Author: geoffrey-elliott

dashboard/app/controllers/reports_controller.rb

@@ -10,6 +10,11 @@ class ReportsController < ApplicationController
   before_action :set_script
   include LevelSourceHintsHelper
 
+  before_action except: [:user_stats, :header_stats, :students, :prizes, :assume_identity, :assume_identity_form] do
+    render status: :forbidden, text: "Disabled during HOC because it's too slow"
+    return false
+  end
+
   def user_stats
     @user = User.find(params[:user_id])
     authorize! :read, @user

dashboard/test/controllers/reports_controller_test.rb

@@ -152,7 +152,8 @@ class ReportsControllerTest < ActionController::TestCase
 
   test "should get usage" do
     get :usage, :user_id => @not_admin.id
-    assert_response :success
+    assert_response :forbidden # disabled for hoc
+    #assert_response :success
   end
 
   test "should not get usage if not signed in" do
@@ -166,17 +167,18 @@ class ReportsControllerTest < ActionController::TestCase
     sign_in @not_admin
 
     get :usage, :user_id => @not_admin.id
-
-    assert_response :success
+    assert_response :forbidden # disabled for hoc
+    #assert_response :success
   end
 
 
   test "should get usage for students if teacher" do
     sign_in @teacher
 
     get :usage, :user_id => @student.id
+    assert_response :forbidden # disabled for hoc
 
-    assert_response :success
+    #assert_response :success
   end
 
   test "should not get usage for other users if not admin or teacher" do
@@ -216,11 +218,30 @@ class ReportsControllerTest < ActionController::TestCase
     assert_redirected_to_sign_in
   end
 
-  generate_admin_only_tests_for :all_usage
+  def self.generate_admin_forbidden_tests_for(action, params = {})
+    test "should get #{action}" do
+      get action, params
+      assert_response :forbidden 
+    end
 
-  generate_admin_only_tests_for :admin_stats
+    test "should not get #{action} if not signed in" do
+      sign_out @admin
+      get action, params
+      assert_redirected_to_sign_in
+    end
 
-  generate_admin_only_tests_for :admin_gallery
+    test "should not get #{action} if not admin" do
+      sign_in @not_admin
+      get action, params
+      assert_response :forbidden
+    end
+  end
+
+  generate_admin_forbidden_tests_for :all_usage # disabled for hoc
+
+  generate_admin_forbidden_tests_for :admin_stats # disabled for hoc
+
+  generate_admin_forbidden_tests_for :admin_gallery # disabled for hoc
 
   test "admin_gallery shows most recent 25 gallery items" do
     sign_in @admin
@@ -230,8 +251,9 @@ class ReportsControllerTest < ActionController::TestCase
     end
 
     get :admin_gallery
+    assert_response :forbidden # disabled for hoc
 
-    assert_equal 25, assigns(:gallery_activities).count
+#    assert_equal 25, assigns(:gallery_activities).count
   end
 
   test "students should redirect to new teacher dashboard" do
@@ -241,7 +263,9 @@ class ReportsControllerTest < ActionController::TestCase
 
   test "should get level_stats" do
     get :level_stats, {:level_id => create(:level).id}
-    assert_response :success
+
+    assert_response :forbidden # disabled for hoc
+#    assert_response :success
   end
 
   test "should not get level_stats if not admin" do
@@ -325,7 +349,8 @@ class ReportsControllerTest < ActionController::TestCase
 
   test 'should get admin progress' do
     get :admin_progress
-    assert_select 'h1', 'Admin progress'
+    assert_response :forbidden # disabled for hoc
+#    assert_select 'h1', 'Admin progress'
   end
 
 end

pegasus/data/cdo-partners.csv

@@ -136,6 +136,7 @@ ZenDesk,https://www.zendesk.com/,infrastructure,TRUE,FALSE,TRUE,
 Actua,http://www.actua.ca/,international,TRUE,TRUE,TRUE,
 Adfaber,http://adfaber.org/,international,TRUE,TRUE,TRUE,
 Almooc,http://almooc.com/,international,TRUE,TRUE,TRUE,
+Bebras Challenge,http://www.bebraschallenge.org/,international,TRUE,TRUE,TRUE,
 Cini,http://www.consorzio-cini.it/,international,TRUE,TRUE,TRUE,
 Code Club Aotearoa,http://www.codeclub.org.nz/,international,TRUE,TRUE,TRUE,
 Fundacion Sadosky,http://www.fundacionsadosky.org.ar/,international,TRUE,TRUE,TRUE,
@@ -184,7 +185,7 @@ PopCap,http://www.popcap.com/,majoruk,TRUE,FALSE,TRUE,
 Rovio,http://www.rovio.com,majoruk,TRUE,FALSE,TRUE,
 Salesforce,http://salesforce.com,majoruk,TRUE,FALSE,TRUE,
 Code Club Aotearoa,http://www.codeclub.org.nz/,nz,FALSE,FALSE,TRUE,
-CPIT,http://www.cpit.ac.nz/,nz,FALSE,FALSE,TRUE,
+CPIT,http://www.cpit.ac.nz/news-and-events/news/cpit-supports-hour-of-code?utm_source=Homepage&utm_medium=Banner&utm_campaign=ICT%20-%20Hour%20of%20Code#,nz,FALSE,FALSE,TRUE,
 Google,http://www.google.com/,nz,FALSE,FALSE,TRUE,
 Akamai,http://www.akamai.com,other,FALSE,TRUE,FALSE,
 AngelHack,http://www.angelhack.com/,other,FALSE,TRUE,FALSE,

pegasus/sites.v3/code.org/public/educate/csp/aboutTheWidgets.md

@@ -12,7 +12,7 @@ They have been created primarily as tools to explore computer science concepts.
 
 The widgets currently reside on Baker Franke's Cloud9 account for development, but will eventually be moved under the Code.org domain on Code.org's servers.
 
-All<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dct:title" rel="dct:type">Code.org CSP Widgets</span> by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Baker Franke</span> are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.<br>
+All <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dct:title" rel="dct:type">Code.org CSP Widgets</span> by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Baker Franke</span> are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.<br>
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
 
 
@@ -29,11 +29,11 @@ Many of the widgets employed in this curriculum were originally developed at the
 
 3. In the case of the ***Sending Bits Widgets***...
 
-* Students are *actually* posting data to a remote database (Parse.com) the content of which is not montitored, and they and can more or less post any text they like.  Use with caution if you school has policies about such things. 
-* At the moment there is a limit on the number of database requests-per-second that the widget can handle.  If you or your students do things to push that limit you won't break anything (permenantly), but data will just stop flowing and you'll end up with a lot of confused students.  It is most likely that a single classroom would hit the limit during **lesson 4** the first time you use the widget.
-* Somewhat counter-intuitively the limits on the widget are not related to the amount of data posted or retrived, but the number of times students click "send" or "recv".
+	3. Students are *actually* posting data to a remote database (Parse.com) the content of which is not montitored, and they and can more or less post any text they like.  Use with caution if you school has policies about such things. 
+	3. At the moment there is a limit on the number of database requests-per-second that the widget can handle.  If you or your students do things to push that limit you won't break anything (permenantly), but data will just stop flowing and you'll end up with a lot of confused students.  It is most likely that a single classroom would hit the limit during **lesson 4** the first time you use the widget.
+	3. Somewhat counter-intuitively the limits on the widget are not related to the amount of data posted or retrived, but the number of times students click "send" or "recv".
 
-4. If you have questions about usage or would like to give feed back please do so in the [CSP Forum](https://support.code.org/hc/communities/public/topics/200138206-CS-Principles)
+4. If you have questions about usage or would like to give feedback please do so in the [CSP Forum](https://support.code.org/hc/communities/public/topics/200138206-CS-Principles)
 
 Thanks all,