Skip to content

Commit

Permalink
Merge branch 'master' into generate-new-summaries
Browse files Browse the repository at this point in the history
* master: (258 commits)
  Cleanup Sparks pages that should not be in student-pages
  build(deps-dev): bump rexml from 3.3.2 to 3.3.9
  Set title on embedded iframes, add robots.txt
  a11y: sigh, why isnt this page passing the heading order test?
  delete part of old comment causing test failure...
  a11y: bump axe versions
  a11y: small teachers guide fixes
  a11y: fix one last sparks dev comment; fix compare page color
  a11y:fix some styleguide issues
  a11y: Fix a blue button issue on the old compare page
  a11y: add title to iframe
  a11y: Fix some heading issues in sparks -- just dev comments
  sparks-a11y: replace all h4 elements as div.box-head
  a11y: minor tweaks, add more urls to be tested
  Add a general section to the workflow file
  Fix a small heading order on the create test
  a11y: spec testing/refactoring
  Update gemfile
  CSP - pre-deployment updates to updates page
  a11y: code comment
  ...
  • Loading branch information
cycomachead committed Dec 4, 2024
2 parents fffde8d + 507f0a4 commit e1e1eff
Show file tree
Hide file tree
Showing 1,407 changed files with 113,922 additions and 111,522 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Run rspec tests

on:
- pull_request
- push
- workflow_dispatch

jobs:
a11y:
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
# The files in /bjc-r/course/ (excluding the .html)
# These correspond to rspec tags for each test run.
course:
- bjc4nyc
- bjc4nyc.es
- sparks
- bjc4nyc_teacher
- sparks-teacher
- general
suite:
- wcag20
- wcag22
steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
# Specified by .ruby-version
bundler-cache: true
- name: a11y tests
run: bundle exec rspec utilities/specs --tag ${{ matrix.course }}_${{ matrix.suite }}
- name: summary
if: always()
run: ruby utilities/specs/spec_summary.rb
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*.log
._*
.#*
tmp/

# IDE-Specific Files
.project
Expand Down
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-f progress -f documentation --out tmp/rspec_output.txt -f json --out tmp/rspec_output.json -f html --out tmp/rspec_output.html
1 change: 0 additions & 1 deletion Gemfile

This file was deleted.

27 changes: 27 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

# This Gemfile is for tests inside this repo.
# The `build-tools` directory has its own Gemfile for the build tools.

# Install with: bundle install
source 'https://rubygems.org'

ruby file: '.ruby-version'

group :development, :test do
# Testing framework
gem 'rspec'
# Browser-based testing hooks
gem 'capybara'
gem 'capybara-screenshot'
gem 'selenium-webdriver'
gem 'webdrivers'
# Accessibility testing tools
gem 'axe-core-capybara'
gem 'axe-core-rspec'
# Testing supports
gem 'nokogiri'
gem 'rack', '~> 3'
gem 'rackup'
gem 'webrick'
end
1 change: 0 additions & 1 deletion Gemfile.lock

This file was deleted.

134 changes: 134 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
axe-core-api (4.10.0)
dumb_delegator
virtus
axe-core-capybara (4.10.0)
axe-core-api (= 4.10.0)
dumb_delegator
axe-core-rspec (4.10.0)
axe-core-api (= 4.10.0)
dumb_delegator
virtus
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
childprocess (5.0.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.5.1)
dumb_delegator (1.0.0)
ice_nine (0.11.2)
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
matrix (0.4.2)
mini_mime (1.1.5)
nokogiri (1.16.6-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
public_suffix (5.1.1)
racc (1.8.0)
rack (3.1.7)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
regexp_parser (2.9.2)
rexml (3.3.9)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubyzip (2.3.2)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
thread_safe (0.3.6)
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
webdrivers (5.3.1)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0, < 4.11)
webrick (1.8.1)
websocket (1.2.10)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnu
arm-linux-gnueabihf
arm-linux-musl
arm-linux-musleabihf
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
axe-core-capybara
axe-core-rspec
capybara
capybara-screenshot
nokogiri
rack (~> 3)
rackup
rspec
selenium-webdriver
webdrivers
webrick

RUBY VERSION
ruby 3.2.2p53

BUNDLED WITH
2.5.6
2 changes: 1 addition & 1 deletion course/bjc4nyc.es.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2>La belleza y alegría de la informática&mdash;<em>BJC</em></h2>
<ul><li><strong><a href="/bjc-r/topic/topic.es.html?topic=nyc_bjc/create-task.es.topic" title="Create Task de AP CSP"><em>Create Task</em> de AP CSP</a></strong></li></ul>
</div>
<p>Las unidades 1 a 5 cubren todo el curriculum AP CSP 2020. Estás listo para el examen. Las unidades 6 a 8 se enfocan en la jerarquía de abstracción sobre cómo las computadoras trabajan, así como la recursión, una bella y poderosa idea de las Ciencias de la Computación que va más allá del marco AP CSP y su examen. Estas unidades son perfectas para disfrutarlas luego de tomar el examen.</p>
<div class="todo"><div class="sidenote">
<div class="todo"> <!-- WHEN WE UNHIDE THIS, ALSO UNHIDE 1.3.7 LINE 46. --MF, 3/11/24 --><div class="sidenote">
<div class="topic_link">
<a href="/bjc-r/cur/snap-cheat-sheet.es.html" title="Guía de referencia rápida de Snap!">Guía de referencia rápida de Snap<em>!</em></a>
</div>&mdash;Snap<em>!</em> comparado con el lenguaje del examen de AP
Expand Down
2 changes: 1 addition & 1 deletion course/sparks-teacher.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3>Teacher Resources</h3>
<div class="topic_container" novideo noassignment>
<h3>Curriculum Materials</h3>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/1-teaching-guide.topic" title="Unit 1 Teacher Guide: Functions and Data">Unit 1 Teacher Guide: Functions and Data</a></div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/2-teaching-guide.topic" title="Unit 2 Teacher Guide: Sequencing and Iteration">Unit 2 Teacher Guide: Sequencing and Iteration</a> (under<!--TELL TONY WHEN THESE THINGS COME OUT OF DEVELOPMENT SEE 1/17/22 email--> development)</div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/2-teaching-guide.topic" title="Unit 2 Teacher Guide: Sequencing and Iteration">Unit 2 Teacher Guide: Sequencing and Iteration</a><!--TELL TONY WHEN THESE THINGS COME OUT OF DEVELOPMENT SEE 1/17/22 email--></div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/3-teaching-guide.topic" title="Unit 3 Teacher Guide: Hardware">Unit 3 Teacher Guide: Hardware</a></div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion course/sparks.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h2>Beauty and Joy of Computing Sparks</h2>

<div class="topic_container">
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/1-functions-data.topic" title="Unit 1: Functions and Data">Unit 1: Functions and Data</a></div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/2-sequencing-iteration.topic" title="Unit 2: Sequencing and Iteration">Unit 2: Sequencing and Iteration</a> (under development)</div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/2-sequencing-iteration.topic" title="Unit 2: Sequencing and Iteration">Unit 2: Sequencing and Iteration</a></div>
<div class="topic_link"><a href="/bjc-r/topic/topic.html?topic=sparks/3-hardware.topic" title="Unit 3: Hardware">Unit 3: Hardware</a></div>
</div>
</body>
Expand Down
Loading

0 comments on commit e1e1eff

Please sign in to comment.