Skip to content

Commit

Permalink
Merge pull request #1182 from DFE-Digital/dependabot/bundler/standard…
Browse files Browse the repository at this point in the history
…-0.8.1

Bump standard from 0.6.0 to 0.8.1
  • Loading branch information
lawrence-forooghian authored Nov 2, 2020
2 parents 8cd0805 + bdd4d42 commit 70669fa
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 28 deletions.
25 changes: 13 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ GEM
validate_url
webfinger (>= 1.0.1)
parallel (1.19.2)
parser (2.7.1.4)
parser (2.7.2.0)
ast (~> 2.4.1)
pg (1.2.3)
public_suffix (4.0.6)
Expand Down Expand Up @@ -226,7 +226,7 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.7.1)
regexp_parser (1.8.2)
rexml (3.2.4)
rollbar (3.0.1)
rspec-core (3.9.2)
Expand All @@ -246,19 +246,20 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
rubocop (0.90.0)
rubocop (1.0.0)
parallel (~> 1.10)
parser (>= 2.7.1.1)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
parser (>= 2.7.1.4)
rubocop-performance (1.8.0)
rubocop-ast (1.1.0)
parser (>= 2.7.1.5)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.10.1)
rubyzip (2.3.0)
sass-rails (6.0.0)
Expand Down Expand Up @@ -289,9 +290,9 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
standard (0.6.0)
rubocop (~> 0.90)
rubocop-performance (~> 1.8.0)
standard (0.8.1)
rubocop (= 1.0.0)
rubocop-performance (= 1.8.1)
swd (1.2.0)
activesupport (>= 3)
attr_required (>= 0.0.5)
Expand Down
6 changes: 3 additions & 3 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Used to constrain claim journey routing so only slugs
# that are part of a policy’s slug sequence are routed.
class RestrictToSequenceSlugs
restrict_to_sequence_slugs = Class.new {
attr_reader :policy

def initialize(policy)
Expand All @@ -27,11 +27,11 @@ def initialize(policy)
def matches?(request)
request["policy"] == policy.routing_name && policy::SlugSequence::SLUGS.include?(request["slug"])
end
end
}

# Define routes that are specific to each Policy's page sequence
Policies.all.each do |policy|
constraints(RestrictToSequenceSlugs.new(policy)) do
constraints(restrict_to_sequence_slugs.new(policy)) do
scope path: ":policy" do
resources :claims, only: [:show, :update], param: :slug, path: "/"
end
Expand Down
2 changes: 1 addition & 1 deletion spec/models/admin/presenter_methods_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

RSpec.describe Admin::PresenterMethods do
subject(:admin_presenter) do
class DummyClass
Class.new do
include Admin::PresenterMethods
end
end
Expand Down
24 changes: 12 additions & 12 deletions spec/models/maths_and_physics/dqt_record_spec.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
require "rails_helper"

RSpec.describe MathsAndPhysics::DQTRecord do
MATHS_JAC_CODES = %w[G100 G290 G310 G320 G900]
PHYSICS_JAC_CODES = %w[F300 F310 F320 F321 F331]
EXAMPLE_ELIGIBLE_JAC_CODES = MATHS_JAC_CODES + PHYSICS_JAC_CODES
EXAMPLE_NON_ELIGIBLE_JAC_CODES = %w[X100 L800 F100 C700 R100]
maths_jac_codes = %w[G100 G290 G310 G320 G900]
physics_jac_codes = %w[F300 F310 F320 F321 F331]
example_eligible_jac_codes = maths_jac_codes + physics_jac_codes
example_non_eligible_jac_codes = %w[X100 L800 F100 C700 R100]

ELIGIBLE_MATHS_HECOS_CODES = %w[100400 100401 100402 100403 100404 100405 100406 101027 101028 101029 101030 101031 101032 101033 101034].freeze
ELIGIBLE_PHYSICS_HECOS_CODES = %w[100416 100419 100425 100426 101060 101061 101068 101071 101074 101075 101076 101077 101223 101300 101390 101391].freeze
EXAMPLE_ELIGIBLE_HECOS_CODES = ELIGIBLE_MATHS_HECOS_CODES + ELIGIBLE_PHYSICS_HECOS_CODES
EXAMPLE_NON_ELIGIBLE_HECOS_CODES = %w[100430 101066 101078 100300 100396 100427].freeze
eligible_maths_hecos_codes = %w[100400 100401 100402 100403 100404 100405 100406 101027 101028 101029 101030 101031 101032 101033 101034].freeze
eligible_physics_hecos_codes = %w[100416 100419 100425 100426 101060 101061 101068 101071 101074 101075 101076 101077 101223 101300 101390 101391].freeze
example_eligible_hecos_codes = eligible_maths_hecos_codes + eligible_physics_hecos_codes
example_non_eligible_hecos_codes = %w[100430 101066 101078 100300 100396 100427].freeze

describe "#eligible?" do
EXAMPLE_ELIGIBLE_JAC_CODES.each do |jac_code|
example_eligible_jac_codes.each do |jac_code|
context "when the given ITT subject (#{jac_code}) is eligible" do
let(:attributes) { {itt_subject_codes: [jac_code], degree_codes: []} }

Expand Down Expand Up @@ -50,7 +50,7 @@
end
end

EXAMPLE_ELIGIBLE_HECOS_CODES.each do |hecos_code|
example_eligible_hecos_codes.each do |hecos_code|
context "when the given ITT subject HECoS code (#{hecos_code}) is eligible" do
let(:attributes) { {itt_subject_codes: [hecos_code], degree_codes: []} }

Expand Down Expand Up @@ -88,7 +88,7 @@
end
end

EXAMPLE_NON_ELIGIBLE_JAC_CODES.each do |jac_code|
example_non_eligible_jac_codes.each do |jac_code|
context "when the given ITT subject or degree (#{jac_code}) isn't eligible" do
let(:attributes) { {itt_subject_codes: [jac_code], degree_codes: [jac_code]} }

Expand All @@ -98,7 +98,7 @@
end
end

EXAMPLE_NON_ELIGIBLE_HECOS_CODES.each do |hecos_code|
example_non_eligible_hecos_codes.each do |hecos_code|
context "when given ITT subject or degree (#{hecos_code}) - HECOS code isn't eligible" do
let(:attributes) { {itt_subject_codes: [hecos_code], degree_codes: [hecos_code]} }
it "always returns false" do
Expand Down

0 comments on commit 70669fa

Please sign in to comment.