diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/config.rb b/config.rb
index abc1234..def5678 100644
--- a/config.rb
+++ b/config.rb
@@ -13,4 +13,3 @@
css_dir = "css"
sass_dir = "_sass"
-output_style = :compressed
| Remove compass option output_style as it's not being used.
|
diff --git a/config.ru b/config.ru
index abc1234..def5678 100644
--- a/config.ru
+++ b/config.ru
@@ -11,5 +11,5 @@ reverse_proxy_options preserve_host: true
# Forward the path /test* to http://example.com/test*
- reverse_proxy '/latin-america/', 'http://www.terra-i.org/latin-america/'
+ reverse_proxy /^\/gfw-assets\/?(.*)$/, 'https://cdn.rawgit.com/simbiotica/gfw_assets/831ef6558cf2693357fb23829ef7e6acf7ebc840/src/header-loader.js$1'
end
| Create PROXY to redirect to the assets js file
|
diff --git a/spec/support/shared_context_for_api.rb b/spec/support/shared_context_for_api.rb
index abc1234..def5678 100644
--- a/spec/support/shared_context_for_api.rb
+++ b/spec/support/shared_context_for_api.rb
@@ -7,8 +7,7 @@
shared_context 'authenticated user via local token', authenticated: true do
- let(:username) { 'user' }
- let(:token) { Fabricate(:token, username: username) }
+ let(:token) { Fabricate(:token, username: 'user') }
let(:access_token) { token.uuid }
def auth_get(path, **params)
| Remove unnecessary :username variable from shared context for api
|
diff --git a/week-4/simple-string.rb b/week-4/simple-string.rb
index abc1234..def5678 100644
--- a/week-4/simple-string.rb
+++ b/week-4/simple-string.rb
@@ -0,0 +1,28 @@+# Solution Below
+
+old_string = "Ruby is cool"
+new_string = old_string.reverse.upcase
+
+
+# RSpec Tests. They are included in this file because the local variables you are creating are not accessible across files. If we try to run these files as a separate file per normal operation, the local variable checks will return nil.
+
+
+describe "old_string" do
+ it 'is defined as a local variable' do
+ expect(defined?(old_string)).to eq 'local-variable'
+ end
+
+ it "has the value 'Ruby is cool'" do
+ expect(old_string).to eq "Ruby is cool"
+ end
+end
+
+describe 'new_string' do
+ it 'is defined as a local variable' do
+ expect(defined?(new_string)).to eq 'local-variable'
+ end
+
+ it 'has the value "LOOC SI YBUR"' do
+ expect(new_string).to eq "LOOC SI YBUR"
+ end
+end | Add simple string methods exercise
|
diff --git a/features/step_definitions/cli_steps.rb b/features/step_definitions/cli_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/cli_steps.rb
+++ b/features/step_definitions/cli_steps.rb
@@ -23,6 +23,10 @@ end
end
+Then /^it succeeds$/ do
+ @last_error.should be_nil
+end
+
Then /^it fails with messages like$/ do |pattern|
@last_error.should_not be_nil
@last_error.message.should match Regexp.new(pattern.strip().gsub(/\s+/, '\s+'))
| Add a step to verify successful exit status
|
diff --git a/hostel.gemspec b/hostel.gemspec
index abc1234..def5678 100644
--- a/hostel.gemspec
+++ b/hostel.gemspec
@@ -17,10 +17,10 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']
- spec.add_dependency 'activesupport', '~> 4.0.0'
+ spec.add_dependency 'activesupport'
spec.add_development_dependency 'bundler', '~> 1.6'
spec.add_development_dependency 'rspec', '~> 2.6'
- spec.add_development_dependency 'rails', '~> 4.0.0'
+ spec.add_development_dependency 'rails'
spec.add_development_dependency 'rake'
end
| Remove explicit dependency on a specific rails version
|
diff --git a/raygun_client.gemspec b/raygun_client.gemspec
index abc1234..def5678 100644
--- a/raygun_client.gemspec
+++ b/raygun_client.gemspec
@@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = 'raygun_client'
- s.version = '0.5.1.0'
+ s.version = '0.5.2.0'
s.summary = 'Client for the Raygun API using the Obsidian HTTP client'
s.description = ' '
| Package version is increased from 0.5.1.0 to 0.5.2.0
|
diff --git a/display.rb b/display.rb
index abc1234..def5678 100644
--- a/display.rb
+++ b/display.rb
@@ -3,7 +3,8 @@ #
# Android Cluster Toolkit
#
-# list.rb - list which android devices are plugged in ($devices and adb_devices)
+# display.rb - list which android devices are plugged in
+# (in both $devices[:connected] and adb_devices)
#
# (c) 2012-2015 Joshua J. Drake (jduck)
#
@@ -29,7 +30,7 @@ $devices.each { |dev|
adb_devices.each { |ser|
if dev[:serial] == ser
- puts "[*] #{dev[:name]} / #{dev[:serial]}"
+ puts " #{dev[:name]} / #{dev[:serial]}"
break
end
}
| Make device lines stand out a bit more.
|
diff --git a/language/comment_spec.rb b/language/comment_spec.rb
index abc1234..def5678 100644
--- a/language/comment_spec.rb
+++ b/language/comment_spec.rb
@@ -0,0 +1,15 @@+require_relative '../spec_helper'
+
+describe "The comment" do
+ ruby_version_is "2.7" do
+ it "can be placed between fluent dot now" do
+ code = <<~CODE
+ 10
+ # some comment
+ .to_s
+ CODE
+
+ eval(code).should == '10'
+ end
+ end
+end
| Add new specs. Comment lines can be placed between fluent dot now
|
diff --git a/test/integration/games_interface_test.rb b/test/integration/games_interface_test.rb
index abc1234..def5678 100644
--- a/test/integration/games_interface_test.rb
+++ b/test/integration/games_interface_test.rb
@@ -17,8 +17,8 @@ # TODO: Redo this whole test.
# assert_select 'div#error_explanation'
# Valid submission
- show_date = Date.new(1983, 7, 18)
- date_played = Time.zone.now
+ # show_date = Date.new(1983, 7, 18)
+ # date_played = Time.zone.now
# TODO: See previous TODOs.
# assert_difference 'Game.count', 1 do
# post games_path, game: { show_date: show_date, date_played: date_played }
| Comment out unused variable assignments
|
diff --git a/lib/braingasm/machine.rb b/lib/braingasm/machine.rb
index abc1234..def5678 100644
--- a/lib/braingasm/machine.rb
+++ b/lib/braingasm/machine.rb
@@ -57,7 +57,7 @@ end
def inst_print_cell
- print @tape[dp].chr
+ print @tape[@dp].chr
@ip + 1
end
| Use instanace variable instead of getter method
|
diff --git a/lib/duckduckgo/search.rb b/lib/duckduckgo/search.rb
index abc1234..def5678 100644
--- a/lib/duckduckgo/search.rb
+++ b/lib/duckduckgo/search.rb
@@ -10,9 +10,10 @@ results = []
html = open("#{RESOURCE_URL}#{CGI::escape(query)}")
+
document = Nokogiri::HTML(html)
- document.css('.result').each do |result|
+ document.css('#links').each do |result|
title_element = result.css('.result__a').first
raise 'Could not find result link element!' if title_element.nil?
| Use the 'links' id when finding results, rather than the 'results' class
|
diff --git a/lib/github_api/client.rb b/lib/github_api/client.rb
index abc1234..def5678 100644
--- a/lib/github_api/client.rb
+++ b/lib/github_api/client.rb
@@ -7,7 +7,10 @@ @gists ||= Github::Gists.new(options)
end
- def git_data(options)
+ # The Git Database API gives you access to read and write raw Git objects
+ # to your Git database on GitHub and to list and update your references
+ # (branch heads and tags).
+ def git_data(options = {})
@git_data ||= Github::GitData.new(options)
end
@@ -27,6 +30,8 @@ @repos ||= Github::Repos.new(options)
end
+ # Many of the resources on the users API provide a shortcut for getting
+ # information about the currently authenticated user.
def users(options = {})
@users ||= Github::Users.new(options)
end
| Fix git_data params issue, add method documentation.
|
diff --git a/db/migrate/20160510232957_change_rereview_and_resubmission_deadlines.rb b/db/migrate/20160510232957_change_rereview_and_resubmission_deadlines.rb
index abc1234..def5678 100644
--- a/db/migrate/20160510232957_change_rereview_and_resubmission_deadlines.rb
+++ b/db/migrate/20160510232957_change_rereview_and_resubmission_deadlines.rb
@@ -9,7 +9,7 @@
rereview_deadlines = DueDate.where(:deadline_type_id=>4)
rereview_deadlines.each do |resubmission_deadline|
- rereview_deadline.deadline_type = 1
+ rereview_deadline.deadline_type = 2
rereview_deadline.submission_allowed_id=3
rereview_deadline.save
end
| Fix error in former migration.
|
diff --git a/site-cookbooks/dna/recipes/dotfiles.rb b/site-cookbooks/dna/recipes/dotfiles.rb
index abc1234..def5678 100644
--- a/site-cookbooks/dna/recipes/dotfiles.rb
+++ b/site-cookbooks/dna/recipes/dotfiles.rb
@@ -17,6 +17,7 @@ git "Download lvv/git-prompt" do
repository "http://github.com/lvv/git-prompt.git"
destination "#{node['sprout']['home']}/Scripts/git-prompt"
+ reference "eeff805e0bcdab5317ed1027bef2b625a8f7f94b"
action :sync
end
| Use git-prompt pre switch to bash v4
|
diff --git a/lib/gds_api/need_api.rb b/lib/gds_api/need_api.rb
index abc1234..def5678 100644
--- a/lib/gds_api/need_api.rb
+++ b/lib/gds_api/need_api.rb
@@ -3,7 +3,7 @@ class GdsApi::NeedApi < GdsApi::Base
def needs(options = {})
- query = "?"+options.map { |k,v| "#{k}=#{v}" }.join("&") unless options.empty?
+ query = query_string(options)
get_list!("#{endpoint}/needs#{query}")
end
| Use query_string method instead of manually mapping query parameters
|
diff --git a/lib/model/class_meta.rb b/lib/model/class_meta.rb
index abc1234..def5678 100644
--- a/lib/model/class_meta.rb
+++ b/lib/model/class_meta.rb
@@ -14,6 +14,11 @@ return @name == obj.name
end
+ def add_attribute(attribute)
+ @attributes ||= []
+ @attributes << attribute
+ end
+
end
end
| Add method to add attribute to class.
|
diff --git a/lib/opal/path_reader.rb b/lib/opal/path_reader.rb
index abc1234..def5678 100644
--- a/lib/opal/path_reader.rb
+++ b/lib/opal/path_reader.rb
@@ -17,7 +17,7 @@ def read(path)
full_path = expand(path)
return nil if full_path.nil?
- File.open(full_path, 'rb:UTF-8', &:read)
+ File.open(full_path, 'rb:UTF-8', &:read) if File.exist?(full_path)
end
def expand(path)
| Return nil from PathReader if the file is missing
|
diff --git a/lib/speed_gun/config.rb b/lib/speed_gun/config.rb
index abc1234..def5678 100644
--- a/lib/speed_gun/config.rb
+++ b/lib/speed_gun/config.rb
@@ -5,6 +5,10 @@ # @!attribute [rw]
# @return [true, false] true if enabled speed gun
property :enable, default: true
+
+ # @!attribute [rw]
+ # @return [Object, nil] logger of the speed gun
+ property :logger, default: nil
# @return [true]
def enable!
| Add logger sttribute into Config
|
diff --git a/lib/string_to_pinyin.rb b/lib/string_to_pinyin.rb
index abc1234..def5678 100644
--- a/lib/string_to_pinyin.rb
+++ b/lib/string_to_pinyin.rb
@@ -2,21 +2,18 @@ class String
def to_pinyin
- h = Hash.new
idx_file_path = File.expand_path('../../data/idx99-tone.txt',__FILE__)
- open(idx_file_path,'r').each do |line|
- a = line.gsub("\n","").split("\t")
- h.store a[0], a[1]
- end
result = ""
self.scan(/./) do |char|
- if h[char]
- result = result + h[char] + " "
+ match = %x[grep -m1 '^#{char}' #{idx_file_path}]
+ if match.empty?
+ result = result + char
else
- result = result + char
+ pinyin = match.gsub("\n","").split("\t")[1]
+ result = result + pinyin + " "
end
end
return result.rstrip
end
-
+
end
| Switch to a more efficient grep based search method
|
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index abc1234..def5678 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -1,53 +1,15 @@-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
-
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
-
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
-
+require 'rubygems'
begin
+ require 'cucumber'
require 'cucumber/rake/task'
- namespace :cucumber do
- Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
- t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
- t.fork = true # You may get faster startup if you set this to false
- t.profile = 'default'
- end
-
- Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
- t.binary = vendored_cucumber_bin
- t.fork = true # You may get faster startup if you set this to false
- t.profile = 'wip'
- end
-
- Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
- t.binary = vendored_cucumber_bin
- t.fork = true # You may get faster startup if you set this to false
- t.profile = 'rerun'
- end
-
- desc 'Run all features'
- task :all => [:ok, :wip]
+ Cucumber::Rake::Task.new(:features) do |t|
+ t.cucumber_opts = "--format pretty"
end
- desc 'Alias for cucumber:ok'
- task :cucumber => 'cucumber:ok'
-
- task :default => :cucumber
-
- task :features => :cucumber do
- STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
- end
+ task :features => 'db:test:prepare'
rescue LoadError
- desc 'cucumber rake task not available (cucumber not installed)'
- task :cucumber do
+ desc 'Cucumber rake task not available'
+ task :features do
abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
end
end
-
-end
| Update Cucumber rake file to the current version. Maybe this will help with our jruby issue.
|
diff --git a/lib/tasks/reminder.rake b/lib/tasks/reminder.rake
index abc1234..def5678 100644
--- a/lib/tasks/reminder.rake
+++ b/lib/tasks/reminder.rake
@@ -1,9 +1,12 @@ require File.expand_path('../../services/slack', __FILE__)
+require 'date'
namespace :slack do
desc 'Reminder for Caviar deadline'
task :reminder do
- client = SlackClient.new(slack_url: ENV["SLACK_URL"], base_url: ENV["BASE_URL"])
- client.alert("Caviar orders close in 30 minutes. Please find the menu and order here: https://team.teespring.com/blogs/sfmenu")
+ unless Date.today.saturday? || Date.today.sunday?
+ client = SlackClient.new(slack_url: ENV["SLACK_URL"], base_url: ENV["BASE_URL"])
+ client.alert("Caviar orders close in 30 minutes. Please find the menu and order here: https://team.teespring.com/blogs/sfmenu")
+ end
end
end
| Stop warning slack on saturdays or sundays |
diff --git a/lib/jstdutil/redgreen.rb b/lib/jstdutil/redgreen.rb
index abc1234..def5678 100644
--- a/lib/jstdutil/redgreen.rb
+++ b/lib/jstdutil/redgreen.rb
@@ -1,3 +1,9 @@+begin
+ require 'Win32/Console/ANSI' if PLATFORM =~ /win32/
+rescue LoadError
+ raise 'You must gem install win32console to use color on Windows'
+end
+
module Jstdutil
class RedGreen
# Borrowed from the ruby redgreen gem
| Add win32console if on windows
|
diff --git a/definitions/sn-centos-6.3/definition.rb b/definitions/sn-centos-6.3/definition.rb
index abc1234..def5678 100644
--- a/definitions/sn-centos-6.3/definition.rb
+++ b/definitions/sn-centos-6.3/definition.rb
@@ -1,10 +1,18 @@ require File.dirname(__FILE__) + "/../.centos/session.rb"
iso = "CentOS-6.3-x86_64-netinstall.iso"
+iso_url = "http://mirror.yellowfiber.net/centos/6.3/isos/x86_64/#{iso}"
session =
- CENTOS_SESSION.merge({ :iso_file => iso,
+ COMMON_SESSION.merge({ :boot_cmd_sequence =>
+ [
+ '<Esc> ',
+ 'linux text ks=http://%IP%:%PORT%/ks.cfg ',
+ '<Enter>'
+ ],
+ :memory_size => "512",
+ :iso_file => iso,
:iso_md5 => "690138908de516b6e5d7d180d085c3f3",
- :iso_src => "http://mirror.yellowfiber.net/centos/6.3/isos/x86_64/#{iso}" })
+ :iso_src => "#{iso_url}" })
Veewee::Session.declare session
| Fix issues specific to 6.3 kickstarts
Before adding the escape, it was going right into the memory test
every time. Also needed to override the default memory of 384 with
512 as the installer was failing due to insufficient memory.
|
diff --git a/spec/adminable/field_collector_spec.rb b/spec/adminable/field_collector_spec.rb
index abc1234..def5678 100644
--- a/spec/adminable/field_collector_spec.rb
+++ b/spec/adminable/field_collector_spec.rb
@@ -0,0 +1,26 @@+describe Adminable::FieldCollector do
+ let!(:collection) { Adminable::FieldCollector.new(Blog::Comment) }
+
+ describe '#all' do
+ it 'returns fields from given model' do
+ expected_classes = %w(
+ Adminable::Fields::Integer.new(:id)
+ Adminable::Fields::Text.new(:body)
+ Adminable::Fields::Datetime.new(:created_at)
+ Adminable::Fields::Datetime.new(:updated_at)
+ Adminable::Fields::BelongsTo.new(:blog_post)
+ Adminable::Fields::BelongsTo.new(:user)
+ )
+
+ expect(collection.all).to eq(expected_classes)
+ end
+ end
+
+ describe '#resolve' do
+ it 'returns field class from given type' do
+ expect(collection.instance_eval { resolve(:string, :title) }).to eq(
+ 'Adminable::Fields::String.new(:title)'
+ )
+ end
+ end
+end
| Add specs for field collector
|
diff --git a/spec/messages/surround_message_spec.rb b/spec/messages/surround_message_spec.rb
index abc1234..def5678 100644
--- a/spec/messages/surround_message_spec.rb
+++ b/spec/messages/surround_message_spec.rb
@@ -3,11 +3,11 @@ describe Lumos::SurroundMessage do
it "returns message" do
- expect(described_class.new(message: "Defodio").message).to eq("Defodio")
+ expect(described_class.new(message: "Defodio").message).to eq("###########\n# #\n# Defodio #\n# #\n###########")
end
it "returns message" do
- expect(described_class.new(message: "Defodio").message_line).to eq("###########\n# #\n# Defodio #\n# #\n###########")
+ expect(described_class.new(message: "Defodio").message_line).to eq("###########")
end
end
| Fix surround spec (in the right place) :P
|
diff --git a/example.rb b/example.rb
index abc1234..def5678 100644
--- a/example.rb
+++ b/example.rb
@@ -11,13 +11,13 @@ until_time = Time.utc(2011, 6, 30)
metadata_prefix = 'datacite'
-list_records_config = Stash::Harvester::ListRecordsConfig.new(
+list_records_config = Stash::Harvester::OAIPMH::ListRecordsConfig.new(
from_time: from_time,
until_time: until_time,
metadata_prefix: metadata_prefix
)
-list_records_task = Stash::Harvester::ListRecordsTask.new(
+list_records_task = Stash::Harvester::OAIPMH::ListRecordsTask.new(
oai_base_url: oai_base_url,
config: list_records_config
)
| Update to reflect module structure
|
diff --git a/twoffein-client.gemspec b/twoffein-client.gemspec
index abc1234..def5678 100644
--- a/twoffein-client.gemspec
+++ b/twoffein-client.gemspec
@@ -6,7 +6,7 @@ gem.email = ["dsiw@dsiw-it.de"]
gem.description = %q{Client for twoffein.de API}
gem.summary = %q{Client for twoffein.de API}
- gem.homepage = ""
+ gem.homepage = "https://github.com/DSIW/twoffein-client"
gem.files = `git ls-files`.split($\)
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -18,6 +18,8 @@ gem.add_development_dependency('aruba')
gem.add_development_dependency('rake','~> 0.9.2')
gem.add_development_dependency('pry')
+ gem.add_development_dependency('webmock')
+ gem.add_development_dependency('vcr')
gem.add_dependency('methadone', '~>1.0.0.rc4')
gem.add_dependency('gli')
end
| Add homepage and dependencies to gemspec
|
diff --git a/features/step_definitions/get_steps.rb b/features/step_definitions/get_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/get_steps.rb
+++ b/features/step_definitions/get_steps.rb
@@ -2,7 +2,7 @@ Given(/^I created an OVH client with my credentials$/) do
# pending # Write code here that turns the phrase above into concrete actions
- @client = OVH::Client.new(application_key: 'app_key', application_secret: 'app_secret', consumer_key: 'consumer_key')
+ @client = OVHApi::Client.new(application_key: 'app_key', application_secret: 'app_secret', consumer_key: 'consumer_key')
end
When(/^I get '\/me' with the sdk$/) do
@@ -16,7 +16,11 @@ # pending # Write code here that turns the phrase above into concrete actions
expect(WebMock).to have_requested(:get, "https://eu.api.ovh.com/1.0/me").
with(:headers => {
- 'Accept'=>'*/*',
+ 'Accept'=>'application/json',
+ 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+ 'Content-Type'=>'application/json',
+ 'Host'=>'eu.api.ovh.com',
+ 'User-Agent'=>'Ruby',
'X-Ovh-Application'=>'app_key',
'X-Ovh-Consumer'=>'consumer_key',
'X-Ovh-Signature'=>'$1$c1635742d2635391138e135e04a78d268e20232d',
| Complete Mock definition to unsure tests to pass
|
diff --git a/lib/tasks/mail_test.rake b/lib/tasks/mail_test.rake
index abc1234..def5678 100644
--- a/lib/tasks/mail_test.rake
+++ b/lib/tasks/mail_test.rake
@@ -0,0 +1,5 @@+task :send_mail_test => :environment do
+ user = User.find(1)
+ Notifier.email_for_present_draw_user(user, "Powerball")
+ puts "sent mail to test"
+end | Add test task to sen email
|
diff --git a/lib/tasks/shownotes.rake b/lib/tasks/shownotes.rake
index abc1234..def5678 100644
--- a/lib/tasks/shownotes.rake
+++ b/lib/tasks/shownotes.rake
@@ -3,7 +3,7 @@ task fetch: :environment do
require 'net/http'
- MINIMUM_SHOW = 490
+ MINIMUM_SHOW = 489 # Before that the URLs are not consistent
NA_RSS_URL = 'http://feed.nashownotes.com/'
response = Net::HTTP.get_response(URI.parse(NA_RSS_URL))
| Set minimum show to 489 instead of 490
|
diff --git a/spec/docker/docker_entrypoint_spec.rb b/spec/docker/docker_entrypoint_spec.rb
index abc1234..def5678 100644
--- a/spec/docker/docker_entrypoint_spec.rb
+++ b/spec/docker/docker_entrypoint_spec.rb
@@ -7,13 +7,7 @@ end
[
- "/docker-entrypoint.d/01-lib-messages.sh",
- "/docker-entrypoint.d/02-lib-wait-for.sh",
"/docker-entrypoint.d/10-default-command.sh",
- "/docker-entrypoint.d/20-docker-introspection.sh",
- "/docker-entrypoint.d/30-environment-certs.sh",
- "/docker-entrypoint.d/40-server-certs.sh",
- "/docker-entrypoint.d/90-exec-command.sh",
].each do |file|
describe file(file) do
it { should be_file }
| Test only own docker_entry.d files
|
diff --git a/spec/features/submit_searches_spec.rb b/spec/features/submit_searches_spec.rb
index abc1234..def5678 100644
--- a/spec/features/submit_searches_spec.rb
+++ b/spec/features/submit_searches_spec.rb
@@ -4,6 +4,6 @@ scenario "render results page on search submit" do
visit('/')
click_on('Find Trials')
- expect(page).to have_content('Results')
+ expect(page).to have_content('Showing clinical trials for')
end
end
| Update feature test because we changed the view it was expecting
|
diff --git a/test/support/integration_fixtures.rb b/test/support/integration_fixtures.rb
index abc1234..def5678 100644
--- a/test/support/integration_fixtures.rb
+++ b/test/support/integration_fixtures.rb
@@ -1,17 +1,15 @@ module IntegrationFixtures
include Fixtures::DefaultMappings
- def sample_document_attributes
- {
- "title" => "TITLE1",
- "description" => "DESCRIPTION",
- "format" => "local_transaction",
- "section" => "life-in-the-uk",
- "link" => "/URL"
- }
- end
+ SAMPLE_DOCUMENT_ATTRIBUTES = {
+ "title" => "TITLE1",
+ "description" => "DESCRIPTION",
+ "format" => "local_transaction",
+ "section" => "life-in-the-uk",
+ "link" => "/URL"
+ }
def sample_document
- Document.from_hash(sample_document_attributes, sample_document_types)
+ Document.from_hash(SAMPLE_DOCUMENT_ATTRIBUTES, sample_document_types)
end
end
| Use constant for test data
There is no need for this data to be available as a method.
|
diff --git a/lib/healthy/a19/response_validator.rb b/lib/healthy/a19/response_validator.rb
index abc1234..def5678 100644
--- a/lib/healthy/a19/response_validator.rb
+++ b/lib/healthy/a19/response_validator.rb
@@ -16,7 +16,7 @@ when '500'
validate_500
else
- raise ::Healthy::UnknownFailure, "Unexpected HTTP response code #{response.code} while fetching #{patient_id}."
+ raise ::Healthy::UnknownFailure, "Unexpected HTTP response code #{response.code}."
end
end
| Fix that patient_id is not known
|
diff --git a/lib/i18n/hygiene/key_usage_checker.rb b/lib/i18n/hygiene/key_usage_checker.rb
index abc1234..def5678 100644
--- a/lib/i18n/hygiene/key_usage_checker.rb
+++ b/lib/i18n/hygiene/key_usage_checker.rb
@@ -5,6 +5,8 @@
def initialize(directories:)
@directories = directories
+
+ raise "Must have git installed!" unless system("which git > /dev/null")
end
def used?(key)
| Raise if git isn't installed
|
diff --git a/lib/middleman/pagination/extension.rb b/lib/middleman/pagination/extension.rb
index abc1234..def5678 100644
--- a/lib/middleman/pagination/extension.rb
+++ b/lib/middleman/pagination/extension.rb
@@ -9,7 +9,7 @@ end
def manipulate_resource_list(resources)
- mainpulated = ManipulatedResources.new(@context, resources)
+ mainpulated = ManipulatedResources.new(@context, resources.sort_by(&:path))
mainpulated.resource_list
end
| Sort resources by path for consistency across installations
|
diff --git a/lib/omniauth/strategies/spiceworks.rb b/lib/omniauth/strategies/spiceworks.rb
index abc1234..def5678 100644
--- a/lib/omniauth/strategies/spiceworks.rb
+++ b/lib/omniauth/strategies/spiceworks.rb
@@ -5,14 +5,15 @@
option :name, 'spiceworks'
option :client_options, {
- site: 'https://accounts.spiceworks.com'
+ #site: 'https://accounts.spiceworks.com'
+ site: 'http://localhost:3010'
}
- uid{raw_info[:spiceworks_id]}
+ uid{raw_info['spiceworks_id']}
info do
{
first_name: raw_info['first_name'],
last_name: raw_info['last_name'],
- name: raw_info['first_name'] + ' ' + raw_info['last_name'],
+ name: raw_info['first_name'],
email: raw_info['email']
}
end
@@ -24,7 +25,8 @@
private
def raw_info
- @raw_info ||= access_token.get('http://www.account.spiceworks.com/api/public/v1/users/user')
+ #@raw_info ||= access_token.get('http://www.account.spiceworks.com/api/public/v1/users/user')
+ @raw_info ||= access_token.get('http://localhost:3010/api/public/v1/users/user').parsed['user'] || {}
end
end
| Fix how we access the response hash.
We now parse the response hash and get user from it before getting our
values.
|
diff --git a/lib/tasks/create_importer_schema.rake b/lib/tasks/create_importer_schema.rake
index abc1234..def5678 100644
--- a/lib/tasks/create_importer_schema.rake
+++ b/lib/tasks/create_importer_schema.rake
@@ -0,0 +1,22 @@+# encoding: utf-8
+namespace :db do
+ desc 'Create importer schema and assign privileges to owner'
+ task :create_importer_schema => :environment do
+ def needs_importer_schema?(user)
+ !user.in_database[%Q(SELECT * FROM pg_namespace)]
+ .map { |record| record.fetch(:nspname) }
+ .include?('importer')
+ rescue => exception
+ false
+ end #importer_schema_exists?
+
+ User.all
+ .select { |user| needs_importer_schema?(user) }
+ .each { |user|
+ puts user.inspect
+ user.create_importer_schema
+ user.set_database_permissions
+ }
+ end
+end
+
| [importer] Implement rake task to create importer schema for those users that don't have it
|
diff --git a/interchangeable.gemspec b/interchangeable.gemspec
index abc1234..def5678 100644
--- a/interchangeable.gemspec
+++ b/interchangeable.gemspec
@@ -20,4 +20,6 @@
spec.add_development_dependency "bundler", "~> 1.6"
spec.add_development_dependency "rake"
+
+ spec.add_runtime_dependency "terminal-table"
end
| Add a dependency on terminal table.
|
diff --git a/Casks/jawbone-updater.rb b/Casks/jawbone-updater.rb
index abc1234..def5678 100644
--- a/Casks/jawbone-updater.rb
+++ b/Casks/jawbone-updater.rb
@@ -4,7 +4,7 @@
url "http://content.jawbone.com/store/dashboard/Jawbone_Updater-#{version}.pkg"
name 'Jawbone Updater'
- homepage 'http://jawbone.com/'
+ homepage 'https://jawbone.com/'
license :gpl
pkg "Jawbone_Updater-#{version}.pkg"
| Fix homepage to use SSL in Jawbone Updater Cask
The HTTP URL is already getting redirected to HTTPS. Using the HTTPS URL directly
makes it more secure and saves a HTTP round-trip.
|
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -10,12 +10,13 @@
def surveys
csv = CSV.generate do |builder|
- builder << [:id, :user_id, *Survey::QUESTIONS.map(&:key)]
+ builder << [:id, :user_id, :updated_at, *Survey::QUESTIONS.map(&:key)]
Survey.find_each do |survey|
builder << [
survey.id,
survey.user_id,
+ survey.updated_at,
*Survey::QUESTIONS.map { |q| survey.localized_answer_for(q) }
]
end
| Include updated_at in surveys CSV
|
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -3,7 +3,10 @@ if @team.present?
@users = @team.users
else
- @users = User.all.page(params[:page]).per(50).decorate
+ @users = User.all
+ .order(:full_name)
+ .page(params[:page]).per(100)
+ .decorate
end
end
end
| Order admin users page by name
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -25,7 +25,7 @@ protected
def log_error(error)
caller[0] =~ /`([^']*)'/ and where = $1
- logger.error "[#{where}] #{error.class}: #{error.to_s}"
+ logger.error "[#{where}] #{error.class}: #{error.message}"
logger.info error.backtrace.join("\n")
#ExceptionNotifier::Notifier.exception_notification(request.env, error).deliver
end
| Fix method name in log_error to display exception text instead of class name for a second time
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,7 +23,7 @@ end
def get_items_to_vote_on(user)
- Item.where('id NOT IN (?)', get_item_id_from_vote(user)).where(item_type_id: 1)
+ find_action_item_type_in_item().where('items.id NOT IN (?)', get_item_id_from_vote(user))
end
private
| Fix Having Hardcode Item Type Number Get Next Item
Fix the Hardcode Item Type number having to be Hardcode in order to get
the next item for the user.
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,8 @@ # Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
+
+ after_action do
+ flash[:alert] = nil
+ end
end
| Clear alert after every action.
|
diff --git a/app/controllers/derivatives_controller.rb b/app/controllers/derivatives_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/derivatives_controller.rb
+++ b/app/controllers/derivatives_controller.rb
@@ -18,7 +18,7 @@ return
end
- masterfile = MasterFile.find(params[:id])
+ masterfile = MasterFile.find(params[:master])
if cannot? :edit, masterfile.container.pid
flash[:notice] = "You do not have sufficient privileges to add derivative files"
redirect_to root_path
@@ -26,7 +26,7 @@ end
derivative = Derivative.new
- derivative.url = params[:video_url]
+ derivative.url = params[:stream_url]
derivative.masterfile = masterfile
derivative.save
| Remove new PIDs after each feature instead of waiting until teardown
|
diff --git a/app/helpers/sapphire_cms/client_helper.rb b/app/helpers/sapphire_cms/client_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/sapphire_cms/client_helper.rb
+++ b/app/helpers/sapphire_cms/client_helper.rb
@@ -8,7 +8,7 @@ end
def precached_blocks
- blocks = ContentBlock.where(precache: true).order('version DESC').group(:slug)
+ blocks = ContentBlock.where(precache: true, status: 'published').order('version DESC').group(:slug)
blocks.to_json
end
end
| Stop pre-caching blocks that aren't published
|
diff --git a/plugins/kernel_v1/plugin.rb b/plugins/kernel_v1/plugin.rb
index abc1234..def5678 100644
--- a/plugins/kernel_v1/plugin.rb
+++ b/plugins/kernel_v1/plugin.rb
@@ -11,28 +11,31 @@ basic functionality of Vagrant version 1.
DESC
- # Core configuration keys provided by the kernel.
- config("ssh") do
+ # Core configuration keys provided by the kernel. Note that all
+ # the kernel configuration classes are marked as _upgrade safe_ (the
+ # true 2nd param). This means that these can be loaded in ANY version
+ # of the core of Vagrant.
+ config("ssh", true) do
require File.expand_path("../config/ssh", __FILE__)
SSHConfig
end
- config("nfs") do
+ config("nfs", true) do
require File.expand_path("../config/nfs", __FILE__)
NFSConfig
end
- config("package") do
+ config("package", true) do
require File.expand_path("../config/package", __FILE__)
PackageConfig
end
- config("vagrant") do
+ config("vagrant", true) do
require File.expand_path("../config/vagrant", __FILE__)
VagrantConfig
end
- config("vm") do
+ config("vm", true) do
require File.expand_path("../config/vm", __FILE__)
VMConfig
end
| Mark core config classes as upgrade safe
|
diff --git a/test/json_serializer_test.rb b/test/json_serializer_test.rb
index abc1234..def5678 100644
--- a/test/json_serializer_test.rb
+++ b/test/json_serializer_test.rb
@@ -1,7 +1,7 @@ require 'cutest'
require_relative '../lib/json_serializer'
-Post = Struct.new :id, :title
+Post = Struct.new :id, :title, :created_at
class PostSerializer < JsonSerializer
attribute :id
@@ -37,7 +37,7 @@ post = Post.new 1, 'tsunami'
serializer = PostWithRootSerializer.new post
- result = { post: post.to_h }.to_json
+ result = { post: { id: 1, title: 'tsunami' } }.to_json
assert_equal result, serializer.to_json
end
| Add another attribute to Post struct to check that is not included.
|
diff --git a/rb/lib/selenium/webdriver/remote/response.rb b/rb/lib/selenium/webdriver/remote/response.rb
index abc1234..def5678 100644
--- a/rb/lib/selenium/webdriver/remote/response.rb
+++ b/rb/lib/selenium/webdriver/remote/response.rb
@@ -64,6 +64,10 @@ file = "#{class_name}(#{file})"
end
+ if meth.nil? || meth.empty?
+ meth = 'unknown'
+ end
+
"[remote server] #{file}:#{line}:in `#{meth}'"
end.compact
| JariBakken: Set method to 'unknown' if not provided in the server's stack frame.
r11605
|
diff --git a/middleman-alias.gemspec b/middleman-alias.gemspec
index abc1234..def5678 100644
--- a/middleman-alias.gemspec
+++ b/middleman-alias.gemspec
@@ -18,10 +18,10 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
- spec.add_dependency "middleman-core", ["~> 3.2","< 3.4.0"]
+ spec.add_dependency "middleman-core", ["~> 3.2"]
spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rake"
spec.add_development_dependency "cucumber", "~> 2.1.0"
- spec.add_development_dependency "aruba", "~> 0.5.1"
+ spec.add_development_dependency "aruba", "~> 0.7.4"
end
| Update aruba to allow the latest version of middleman-core
|
diff --git a/gramola.rb b/gramola.rb
index abc1234..def5678 100644
--- a/gramola.rb
+++ b/gramola.rb
@@ -1,11 +1,15 @@ #!/usr/bin/env ruby
-# Just play all the music files under your '/Music' folder using afplay
-# Usage: './gramola.rb' or 'ruby gramola.rb'
+# Just shuffle play all the music files under your '/Music' folder using afplay
+# Many features xD:
+# Run:'ruby gramola.rb' or do once 'chmod +x gramola.rb' and then exec with './gramola.rb'
+# "Background mode": './gramola.rb &'
+# Pause: Ctrl-Z or 'fg' + Crl-Z if background
+# Resume: 'fg'
+#
#
MUSIC_FOLDER='Music'
MUSIC_EXTENSIONS='*{.mp3}' #TODO: check all afplay supported
-music_files = Dir[File.join(Dir.home,MUSIC_FOLDER,'**',MUSIC_EXTENSIONS)]
-music_files.each do |m|
- exec "afplay '#{m}'"
+Dir[File.join(Dir.home,MUSIC_FOLDER,'**','*Placebo*',MUSIC_EXTENSIONS)].shuffle.each do |m|
+ %x{"afplay '#{m}'"}
end | Make it shuffle the songs
|
diff --git a/spec/string_calculator_spec.rb b/spec/string_calculator_spec.rb
index abc1234..def5678 100644
--- a/spec/string_calculator_spec.rb
+++ b/spec/string_calculator_spec.rb
@@ -7,4 +7,8 @@ it 'returns 0 if empty string provided' do
expect(subject.add("")).to eq(0)
end
+
+ it 'returns number if one number provided' do
+ expect(subject.add("1")).to eq(1)
+ end
end
| Test case for one number provided
|
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -4,7 +4,7 @@ @total_payments_received = Payment.sum :amount
@total_invoices_unpaid = @total_invoiced - @total_payments_received
- @payments_by_sponsor = Payment.select('*, sum(amount) as total').group('invoice_id')
+ @payments_by_sponsor = Payment.select('*, sum(amount) as total').group('invoice_id, id')
end
def about
| Use more strict SQL in payments query
SQLite is not as strict here so I didn't catch this locally.
Postgres requires this strictness per the SQL standard.
|
diff --git a/ObjectMapperDeep.podspec b/ObjectMapperDeep.podspec
index abc1234..def5678 100644
--- a/ObjectMapperDeep.podspec
+++ b/ObjectMapperDeep.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = 'ObjectMapperDeep'
- s.version = '0.14.2'
+ s.version = '0.14.3'
s.license = 'MIT'
s.summary = 'JSON Object mapping written in Swift, support deep array mapping'
s.homepage = 'https://github.com/tonyli508/ObjectMapperDeep'
| Update pod spec version to 0.14.3
|
diff --git a/src/controllers/systems_controller.rb b/src/controllers/systems_controller.rb
index abc1234..def5678 100644
--- a/src/controllers/systems_controller.rb
+++ b/src/controllers/systems_controller.rb
@@ -16,6 +16,12 @@ register Sinatra::Reloader
end
+ set(:clone) do |is_clone|
+ condition do
+ is_clone ? params[:system_id] : params[:system_id].nil?
+ end
+ end
+
get '/' do
json System.all
end
@@ -24,7 +30,7 @@ json System.find(params[:id])
end
- post '/' do
+ post '/', clone: false do
system = System.new permit_params
(params[:clouds] || []).each do |cloud|
system.add_cloud Cloud.find(cloud[:id]), cloud[:priority]
@@ -39,6 +45,24 @@ json system
end
+ post '/', clone: true do
+ begin
+ previous_system = System.find(params[:system_id])
+ rescue
+ status 400
+ return '{ "message": "Template system does not exist" }'
+ end
+
+ system = previous_system.dup
+ unless system.save
+ status 400
+ return json system.errors
+ end
+
+ status 201
+ json system
+ end
+
def permit_params
ActionController::Parameters.new(params)
.permit(:name, :template_body, :template_url, :parameters)
| Add route to duplicate system
|
diff --git a/spree_related_products.gemspec b/spree_related_products.gemspec
index abc1234..def5678 100644
--- a/spree_related_products.gemspec
+++ b/spree_related_products.gemspec
@@ -17,8 +17,8 @@
s.has_rdoc = true
- s.add_dependency 'spree_core', '~> 1.3.0'
- s.add_dependency 'spree_promo', '~> 1.3.0'
+ s.add_dependency 'spree_core', '~> 1.3.0.rc1'
+ s.add_dependency 'spree_promo', '~> 1.3.0.rc1'
s.add_development_dependency 'factory_girl', '2.6.4'
s.add_development_dependency 'ffaker'
| Allow 1.3.0.rc1 to be used.
|
diff --git a/app/models/per_transcript_coverage.rb b/app/models/per_transcript_coverage.rb
index abc1234..def5678 100644
--- a/app/models/per_transcript_coverage.rb
+++ b/app/models/per_transcript_coverage.rb
@@ -1,6 +1,6 @@ class PerTranscriptCoverage < ActiveRecord::Base
belongs_to :read_group, :inverse_of => :per_transcript_coverages
- belongs_to :bedgraph_file, :inverse_of => :per_transcript_coverages, :dependent => :destroy
+ belongs_to :bedgraph_file, :inverse_of => :per_transcript_coverages
validates_presence_of :read_group
validates_presence_of :bedgraph_file
end
| Fix bug which prevented deleting read group
The bug was caused by extra ':dependent => :destroy' in
PerTranscriptCoverage model:
belongs_to :bedgraph_file, :inverse_of => :per_transcript_coverages, :dependent => :destroy
Deleting read group caused deleting per_transcript_coverages, which
caused deleting bedgraph_file. This is incorrect, bc this
bedgraph_file could be associated with other existing read groups via
per_transcript_coverages.
Thanks to Brad for help with this and prev bugs that I introduced in
the last round of changes.
|
diff --git a/app/models/services/setup_new_game.rb b/app/models/services/setup_new_game.rb
index abc1234..def5678 100644
--- a/app/models/services/setup_new_game.rb
+++ b/app/models/services/setup_new_game.rb
@@ -1,5 +1,45 @@ class SetupNewGame
+ def initialize(json, game)
+ @game = game
+ @patrol_boat = json["0"]["positions"]
+ @destroyer = json["1"]["positions"]
+ @submarine = json["2"]["positions"]
+ @battleship = json["3"]["positions"]
+ @aircraft_carrier = json["4"]["positions"]
+ # eventually, also process game difficulty setting, utilizing another model (maybe a service?) for computer board setup and AI strategy
+ end
+ def run!
+ @user_board = @game.boards.create(opponent?: false)
+ create_user_ships
+ comp_board = @game.boards.create(opponent?: true)
+ GenerateRandomShips.new(comp_board).run!
+ end
-end+ def create_user_ships
+ patrol_points = strings_to_points(@patrol_boat)
+ @user_board.ships.create(positions: patrol_points, classification: "Patrol Boat")
+
+ destroyer_points = strings_to_points(@destroyer)
+ @user_board.ships.create(positions: destroyer_points, classification: "Destroyer")
+
+ sub_points = strings_to_points(@submarine)
+ @user_board.ships.create(positions: sub_points, classification: "Submarine")
+
+ battle_points = strings_to_points(@battleship)
+ @user_board.ships.create(positions: battle_points, classification: "Battleship")
+
+ carrier_points = strings_to_points(@aircraft_carrier)
+ @user_board.ships.create(positions: carrier_points, classification: "Aircraft Carrier")
+ end
+
+ def strings_to_points(positions)
+ positions.map do |string|
+ x = string[2].to_i
+ y = string[0].to_i
+ ActiveRecord::Point.new(x,y)
+ end
+ end
+
+end
| Establish new game and create all appropriate models
|
diff --git a/app/serializers/teaching_period_serializer.rb b/app/serializers/teaching_period_serializer.rb
index abc1234..def5678 100644
--- a/app/serializers/teaching_period_serializer.rb
+++ b/app/serializers/teaching_period_serializer.rb
@@ -1,11 +1,3 @@ class TeachingPeriodSerializer < ActiveModel::Serializer
- attributes :id, :period, :year
-
- def period
- object.period
- end
-
- def year
- object.year
- end
+ attributes :id, :period, :year, :start_date, :end_date
end
| ENHANCE: Remove the redundant functions from teaching period serializer
|
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index abc1234..def5678 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -2,6 +2,8 @@
module Search
class GlobalService
+ include Gitlab::Utils::StrongMemoize
+
attr_accessor :current_user, :params
attr_reader :default_project_filter
@@ -19,11 +21,15 @@ @projects ||= ProjectsFinder.new(current_user: current_user).execute
end
+ def allowed_scopes
+ strong_memoize(:allowed_scopes) do
+ %w[issues merge_requests milestones]
+ end
+ end
+
def scope
- @scope ||= begin
- allowed_scopes = %w[issues merge_requests milestones]
-
- allowed_scopes.delete(params[:scope]) { 'projects' }
+ strong_memoize(:scope) do
+ allowed_scopes.include?(params[:scope]) ? params[:scope] : 'projects'
end
end
end
| Reduce diff with EE in Search::GlobalService
Signed-off-by: Rémy Coutable <4ea0184b9df19e0786dd00b28e6daa4d26baeb3e@rymai.me>
|
diff --git a/app/workers/inbound_mail_processor.rb b/app/workers/inbound_mail_processor.rb
index abc1234..def5678 100644
--- a/app/workers/inbound_mail_processor.rb
+++ b/app/workers/inbound_mail_processor.rb
@@ -6,9 +6,10 @@ def self.perform(mail_id)
mail = InboundMail.find(mail_id)
to_address = mail.message.to.first
- thread_match = to_address.match(/^thread-([^@]+)/)
- message_match = to_address.match(/^message-([^@]+)/)
- deliver_thread_reply(mail, thread_match.try(:[], 1), message_match.try(:[], 1))
+ thread_token = to_address.match(/^thread-([^@]+)/).to_a[1]
+ message_token = to_address.match(/^message-([^@]+)/).to_a[1]
+ return unless thread_token || message_token
+ deliver_thread_reply(mail, thread_token, message_token)
end
def self.deliver_thread_reply(mail, thread_token, message_token)
| Stop logging emails without valid tokens
This is filling the resque logs
|
diff --git a/version_gemfile.gemspec b/version_gemfile.gemspec
index abc1234..def5678 100644
--- a/version_gemfile.gemspec
+++ b/version_gemfile.gemspec
@@ -18,5 +18,5 @@
gem.add_development_dependency("rake", "~> 13.0.6")
gem.add_development_dependency("rspec", "~> 3.11.0")
- gem.add_development_dependency("standard", "~> 1.11.0")
+ gem.add_development_dependency("standard", "~> 1.12.1")
end
| Update standard requirement from ~> 1.11.0 to ~> 1.12.1
Updates the requirements on [standard](https://github.com/testdouble/standard) to permit the latest version.
- [Release notes](https://github.com/testdouble/standard/releases)
- [Changelog](https://github.com/testdouble/standard/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testdouble/standard/compare/v1.11.0...v1.12.1)
---
updated-dependencies:
- dependency-name: standard
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <5bdcd3c0d4d24ae3e71b3b452a024c6324c7e4bb@github.com> |
diff --git a/solidus_legacy_return_authorizations.gemspec b/solidus_legacy_return_authorizations.gemspec
index abc1234..def5678 100644
--- a/solidus_legacy_return_authorizations.gemspec
+++ b/solidus_legacy_return_authorizations.gemspec
@@ -15,7 +15,7 @@ s.require_path = "lib"
s.requirements << "none"
- s.add_dependency "solidus_core", [">= 1.0.0", "< 1.2.0"]
+ s.add_dependency "solidus_core", "~> 1.0"
s.add_development_dependency "rspec-rails", "~> 3.2"
s.add_development_dependency "simplecov"
| Support solidus versions ~> 1.0
|
diff --git a/spec/unit/error/service_error/errors_spec.rb b/spec/unit/error/service_error/errors_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/error/service_error/errors_spec.rb
+++ b/spec/unit/error/service_error/errors_spec.rb
@@ -0,0 +1,24 @@+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Github::Error::ServiceError, '::errors' do
+ it "matches error codes to error types" do
+ expect(described_class.errors).to include({
+ 400 => Github::Error::BadRequest,
+ 401 => Github::Error::Unauthorized,
+ 403 => Github::Error::Forbidden,
+ 404 => Github::Error::NotFound,
+ 405 => Github::Error::MethodNotAllowed,
+ 406 => Github::Error::NotAcceptable,
+ 409 => Github::Error::Conflict,
+ 414 => Github::Error::UnsupportedMediaType,
+ 422 => Github::Error::UnprocessableEntity,
+ 451 => Github::Error::UnavailableForLegalReasons,
+ 500 => Github::Error::InternalServerError,
+ 501 => Github::Error::NotImplemented,
+ 502 => Github::Error::BadGateway,
+ 503 => Github::Error::ServiceUnavailable
+ })
+ end
+end
| Add tests for error types.
|
diff --git a/lib/flowchart/choice.rb b/lib/flowchart/choice.rb
index abc1234..def5678 100644
--- a/lib/flowchart/choice.rb
+++ b/lib/flowchart/choice.rb
@@ -1,9 +1,5 @@ module Flowchart
class Choice
- def initialize(choices = [])
- @choices = choices
- end
-
def decide(data)
raise NotImplementedError
end
| Remove unnecessary constructor from Flowchart::Choice
|
diff --git a/lib/open_tree_struct.rb b/lib/open_tree_struct.rb
index abc1234..def5678 100644
--- a/lib/open_tree_struct.rb
+++ b/lib/open_tree_struct.rb
@@ -1,4 +1,6 @@ require 'ostruct'
+
+# Author:: Igor
class OpenTreeStruct < OpenStruct
def initialize(hash={})
| Add mention to author in source code
|
diff --git a/lib/rails_datamapper.rb b/lib/rails_datamapper.rb
index abc1234..def5678 100644
--- a/lib/rails_datamapper.rb
+++ b/lib/rails_datamapper.rb
@@ -22,7 +22,7 @@ end
def full_config
- YAML::load(ERB.new(config_file.read).result)
+ YAML::load(ERB.new(File.read(config_file)).result)
end
memoize :full_config
| Fix undefined method `read' for string error |
diff --git a/lib/skeptick/command.rb b/lib/skeptick/command.rb
index abc1234..def5678 100644
--- a/lib/skeptick/command.rb
+++ b/lib/skeptick/command.rb
@@ -27,10 +27,10 @@
def run
opts = {}
- opts[:chdir] = Skeptick.cd_path if Skeptick.cd_path
+ opts[:chdir] = Skeptick.cd_path.to_s if Skeptick.cd_path
if Skeptick.debug_mode?
- Skeptick.log("Skeptick Running: #{command}")
+ Skeptick.log("Skeptick Command: #{command}")
end
im_process = POSIX::Spawn::Child.new(command, opts)
| Call to_s on cd_dir path |
diff --git a/spec/commands/zremrangebyscore_spec.rb b/spec/commands/zremrangebyscore_spec.rb
index abc1234..def5678 100644
--- a/spec/commands/zremrangebyscore_spec.rb
+++ b/spec/commands/zremrangebyscore_spec.rb
@@ -26,7 +26,7 @@
it_should_behave_like "a zset-only command"
- it "should throw a command error" do
+ it "throws a command error" do
expect { @redises.zrevrangebyscore(@key, DateTime.now, '-inf') }.to raise_error(Redis::CommandError)
end
end
| Reword description in zremrangebyscore spec
"Should" is unnecessary in spec descriptions as it is implied.
Change-Id: I1e77bb758635a3107ebada7deb86c4d75ac5786d
Reviewed-on: http://gerrit.causes.com/37709
Reviewed-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f33d@causes.com>
Tested-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f33d@causes.com>
|
diff --git a/spec/integration/integration_helper.rb b/spec/integration/integration_helper.rb
index abc1234..def5678 100644
--- a/spec/integration/integration_helper.rb
+++ b/spec/integration/integration_helper.rb
@@ -21,7 +21,11 @@ end
def use_cucumber_config(file)
- system("mv config/#{file} config/cucumber.yml")
+ if File.file?("#{@project_path}/config/#{file}")
+ system("mv #{@project_path}/config/#{file} #{@project_path}/config/cucumber.yml")
+ else
+ raise "#{file} doesn't exist. Please use existing configuration yaml."
+ end
end
# :reek:TooManyStatements
| Raise exeption if yaml file doesn't exist
|
diff --git a/spec/libraries/random_password_spec.rb b/spec/libraries/random_password_spec.rb
index abc1234..def5678 100644
--- a/spec/libraries/random_password_spec.rb
+++ b/spec/libraries/random_password_spec.rb
@@ -0,0 +1,51 @@+require_relative '../spec_helper'
+require_relative '../../libraries/random_password'
+
+describe OpenSSLCookbook::RandomPassword do
+ let(:instance) do
+ Class.new { include OpenSSLCookbook::RandomPassword }.new
+ end
+
+ describe ".included" do
+ it "requires securerandom" do
+ instance
+ expect(defined?(SecureRandom)).to_not be(false)
+ end
+ end
+
+ describe "#random_password" do
+ context "with no options" do
+ it "returns a random hex password" do
+ expect(instance.random_password).to match(/[a-z0-9]{20}/)
+ end
+ end
+
+ context "with the :length option" do
+ it "returns a password with the given length" do
+ expect(instance.random_password(length: 50).size).to eq(50)
+ end
+ end
+
+ context "with the :mode option" do
+ it "returns a :hex password with :hex" do
+ expect(instance.random_password(mode: :hex)).to match(/[a-z0-9]{20}/)
+ end
+
+ it "returns a :base64 password with :base64" do
+ expect(instance.random_password(mode: :base64).size).to eq(20)
+ end
+
+ it "returns a :random_bytes password with :random_bytes" do
+ # There's nothing to really assert here, since the length can vary
+ # depending on the encoding and whatnot...
+ expect { instance.random_password(mode: :random_bytes) }.to_not raise_error
+ end
+ end
+
+ context "with the :encoding option" do
+ it "returns a password with the forced encoding" do
+ expect(instance.random_password(encoding: "ASCII").encoding.to_s).to eq("US-ASCII")
+ end
+ end
+ end
+end
| Add specs for new library
|
diff --git a/capistrano-send.gemspec b/capistrano-send.gemspec
index abc1234..def5678 100644
--- a/capistrano-send.gemspec
+++ b/capistrano-send.gemspec
@@ -9,6 +9,7 @@ spec.authors = ["Guillaume Dott"]
spec.email = ["guillaume+github@dott.fr"]
spec.summary = %q{Send notifications after a deploy with Capistrano}
+ spec.description = %q{This gem provides some notifiers to send notifications after a deploy with Capistrano.}
spec.homepage = "https://github.com/gdott9/capistrano-send"
spec.license = "MIT"
@@ -21,5 +22,5 @@ spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "libnotify", "~> 0.9.0"
- spec.add_development_dependency "mail", "~> 2.6.3"
+ spec.add_development_dependency "mail", "~> 2.6"
end
| Correct some warnings in gemspec
|
diff --git a/spec/controllers/pwb/api/v1/agency_controller_spec.rb b/spec/controllers/pwb/api/v1/agency_controller_spec.rb
index abc1234..def5678 100644
--- a/spec/controllers/pwb/api/v1/agency_controller_spec.rb
+++ b/spec/controllers/pwb/api/v1/agency_controller_spec.rb
@@ -2,6 +2,60 @@
module Pwb
RSpec.describe Api::V1::AgencyController, type: :controller do
+ routes { Pwb::Engine.routes }
+
+
+ context 'without signing in' do
+ before(:each) do
+ sign_in_stub nil
+ end
+ it "should not have a current_user" do
+ expect(subject.current_user).to eq(nil)
+ end
+
+ end
+
+ context 'with non_admin user' do
+ login_non_admin_user
+
+ it "should have a current_user" do
+ expect(subject.current_user).to_not eq(nil)
+ end
+
+ describe 'GET #show' do
+ it 'returns unauthorized status' do
+ get :show, params: {}
+
+ expect(response.status).to eq(422)
+ end
+ end
+ end
+
+ context 'with admin user' do
+ login_admin_user
+
+ it "should have a current_user" do
+ expect(subject.current_user).to_not eq(nil)
+ end
+
+ describe 'GET #show' do
+ let!(:agency) { FactoryGirl.create(:pwb_agency) }
+
+ it 'returns correct agency' do
+ get :show, params: {}
+ # , format: :json
+
+ expect(response.status).to eq(200)
+ expect(response.content_type).to eq('application/json')
+
+ result = JSON.parse(response.body)
+
+ expect(result).to have_key('agency')
+ expect(result['agency']['id']).to eq(agency.id)
+
+ end
+ end
+ end
end
end
| Fix specs for agency api controller
|
diff --git a/GADI.podspec b/GADI.podspec
index abc1234..def5678 100644
--- a/GADI.podspec
+++ b/GADI.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "GADI"
- s.version = "0.0.2"
+ s.version = "0.0.3"
s.summary = "Google Analytics Dependency Injection for iOS"
s.homepage = "https://github.com/MO-AI/GADI"
s.license = 'MIT'
| Update pod spec file 0.0.3
|
diff --git a/src/simplify/replace_shared_strings.rb b/src/simplify/replace_shared_strings.rb
index abc1234..def5678 100644
--- a/src/simplify/replace_shared_strings.rb
+++ b/src/simplify/replace_shared_strings.rb
@@ -14,7 +14,7 @@ ast.each.with_index do |a, i|
next unless a.is_a?(Array)
if a[0] == :shared_string
- ast[i] = shared_string(ast)
+ ast[i] = shared_string(a)
else
map(a)
end
| Fix bug in shared string replacement
|
diff --git a/app/controllers/api/motions_controller.rb b/app/controllers/api/motions_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/api/motions_controller.rb
+++ b/app/controllers/api/motions_controller.rb
@@ -1,10 +1,14 @@ class Api::MotionsController < ApiController
def index
- @motions = if @@query.empty?
- Motion.all
- else
- Motion.where("lower(amendment_text) LIKE ?", @@query)
- end
+ councillor_id = params[:councillor_id]
+ item_id = params[:item_id]
+ motion_type_id = params[:motion_type_id]
+ @motions = Motion.all
+
+ @motions.where("lower(amendment_text) LIKE ?", @@query) unless @@query.empty?
+ @motions = @motions.where("councillor_id = ?", councillor_id) if councillor_id.present?
+ @motions = @motions.where("item_id = ?", item_id) if item_id.present?
+ @motions = @motions.where("motion_type_id = ?", motion_type_id) if motion_type_id.present?
paginate json: @motions.order(change_query_order), per_page: change_per_page
end
| Change API Motions Query To Use Multiple Criteria
|
diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
index abc1234..def5678 100644
--- a/config/initializers/new_rails_defaults.rb
+++ b/config/initializers/new_rails_defaults.rb
@@ -11,11 +11,11 @@ ActiveRecord::Base.store_full_sti_class = true
end
-ActionController::Routing.generate_best_match = false
+#ActionController::Routing.generate_best_match = false
# Use ISO 8601 format for JSON serialized times and dates.
ActiveSupport.use_standard_json_time_format = true
# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
# if you're including raw json in an HTML page.
-ActiveSupport.escape_html_entities_in_json = false+ActiveSupport.escape_html_entities_in_json = false
| Set routing behavior back to Rails 2 style. |
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
- protect_from_forgery with: :exception
+ protect_from_forgery with: :null_session, :if => Proc.new { |c| c.request.format == 'application/json' }
end
| Disable forgery protection for API calls
(cherry picked from commit f3d9f07)
|
diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -1,5 +1,5 @@ class InvitationsController < Devise::InvitationsController
- after_action :verify_authorized
+ after_action :verify_authorized, except: :edit
layout "login", only: [:edit, :update]
| Make accepting an invitation work again
|
diff --git a/signantia_analysis.rb b/signantia_analysis.rb
index abc1234..def5678 100644
--- a/signantia_analysis.rb
+++ b/signantia_analysis.rb
@@ -16,9 +16,28 @@ opts.on(
'-d',
"--database DATABASE",
- "The database URI - e.g. sqlite:db/example.sqlite3"
+ "The database URI",
+ " e.g. sqlite:db/example.sqlite3"
) do |database|
options[:database] = database
+ end
+
+ opts.on(
+ '-c',
+ "--corpus CORPUS",
+ "The corpus path",
+ " e.g. spec/corpus/"
+ ) do |corpus|
+ options[:corpus] = corpus
+ end
+
+ opts.on(
+ '-r',
+ "--regex REGEX",
+ "The regex to match",
+ " e.g. /[\\S+]/"
+ ) do |corpus|
+ options[:corpus] = corpus
end
end.parse!
| Add corpus and regex options to script.
|
diff --git a/spf_parse.gemspec b/spf_parse.gemspec
index abc1234..def5678 100644
--- a/spf_parse.gemspec
+++ b/spf_parse.gemspec
@@ -19,6 +19,8 @@ gem.require_paths = ["lib"]
gem.required_ruby_version = '>= 1.9.1'
+ gem.add_dependency "parslet", "~> 1.0"
+
gem.add_development_dependency "bundler", "~> 1.6"
gem.add_development_dependency "rake", "~> 10.0"
end
| Add parslet ~> 1.0 as a dependency.
|
diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index abc1234..def5678 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,4 +1,9 @@-default[:passenger][:ruby_version] = "2.5"
+if node[:lsb][:release].to_f < 20.04
+ default[:passenger][:ruby_version] = "2.5"
+else
+ default[:passenger][:ruby_version] = "2.7"
+end
+
default[:passenger][:max_pool_size] = 6
default[:passenger][:pool_idle_time] = 300
default[:passenger][:instance_registry_dir] = "/run/passenger"
| Use ruby 2.7 on Ubuntu 20.04
|
diff --git a/lib/dm-sqlserver-adapter/spec/setup.rb b/lib/dm-sqlserver-adapter/spec/setup.rb
index abc1234..def5678 100644
--- a/lib/dm-sqlserver-adapter/spec/setup.rb
+++ b/lib/dm-sqlserver-adapter/spec/setup.rb
@@ -7,7 +7,15 @@
class SqlserverAdapter < Adapter
def connection_uri
- "#{super};instance=SQLEXPRESS"
+ if instance_name.size > 0
+ "#{super};instance=#{instance_name}"
+ else
+ super
+ end
+ end
+
+ def instance_name
+ ENV.fetch('DM_DB_SQLSERVER_INSTANCE', 'SQLEXPRESS')
end
end
| Make SQL Server instance name configurable via DM_DB_SQLSERVER_INSTANCE.
|
diff --git a/lib/font_awesome/sass/rails/helpers.rb b/lib/font_awesome/sass/rails/helpers.rb
index abc1234..def5678 100644
--- a/lib/font_awesome/sass/rails/helpers.rb
+++ b/lib/font_awesome/sass/rails/helpers.rb
@@ -2,7 +2,10 @@ module Sass
module Rails
module ViewHelpers
- def icon(icon, text="", html_options={})
+ def icon(icon, *args)
+ text, html_options = args
+ html_options = text if text.is_a?(Hash)
+
content_class = "fa fa-#{icon}"
content_class << " #{html_options[:class]}" if html_options.key?(:class)
html_options[:class] = content_class
| Change icon helper input params
Before:
```ruby
<%= icon :spinner, nil, class: "fa-spin" %>
#=> <i class="fa fa-spinner fa-spin"></i>
<%= icon :spinner, "Loading", class: "fa-spin" %>
#=> <i class="fa fa-spinner fa-spin">Loading</i>
```
After
```ruby
<%= icon :spinner, class: "fa-spin" %>
#=> <i class="fa fa-spinner fa-spin"></i>
<%= icon :spinner, "Loading", class: "fa-spin" %>
#=> <i class="fa fa-spinner fa-spin">Loading</i>
``` |
diff --git a/lib/input_sanitizer/restricted_hash.rb b/lib/input_sanitizer/restricted_hash.rb
index abc1234..def5678 100644
--- a/lib/input_sanitizer/restricted_hash.rb
+++ b/lib/input_sanitizer/restricted_hash.rb
@@ -7,6 +7,25 @@
def key_allowed?(key)
@allowed_keys.include?(key)
+ end
+
+ def transform_keys
+ return enum_for(:transform_keys) unless block_given?
+ new_allowed_keys = @allowed_keys.map { |key| yield(key) }
+ result = self.class.new(new_allowed_keys)
+ each_key do |key|
+ result[yield(key)] = self[key]
+ end
+ result
+ end
+
+ def transform_keys!
+ return enum_for(:transform_keys!) unless block_given?
+ @allowed_keys.map! { |key| yield(key) }
+ keys.each do |key|
+ self[yield(key)] = delete(key)
+ end
+ self
end
private
| Fix RestrictedHash for Rails 4.2
In 4.2 the implementation of transform_keys (that is used by
stringify_keys for example) in ActiveSupport's hash
extension changed: rails/rails@f1bad130.
Now it tries to create a new instance of the
class of the object the stringify_keys is called on and not just
creating new class. This means that in case of RestrictedHash it tries
to call RestrictedHash#new with no attributes.
Since ActiveRecord does stringify when you do Model.create(hash)
it basically makes input_sanitizer unusable with Rails 4.2.
This commit overrides the rails extension hash methods transform_keys
and transform_keys! so that it behaves correctly.
Test case: https://gist.github.com/piotrj/25106a05881ba44d38b2
|
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index abc1234..def5678 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -1,7 +1,35 @@ require 'spec_helper'
-describe 'users' do
+describe 'users', :type => 'class' do
context 'with defaults for all parameters' do
+ it { should compile.with_all_deps }
it { should contain_class('users') }
end
+
+ context 'with users passed as hash' do
+ let(:params) do
+ {
+ :hash => {
+ 'alice' => { 'ensure' => 'absent' },
+ 'bob' => { 'ensure' => 'present' },
+ }
+ }
+ end
+
+ it { should compile.with_all_deps }
+ it { should contain_class('users') }
+ it { should contain_file('/home/bob') }
+ it { should contain_users__account('alice').with({:ensure => 'absent'}) }
+ it { should contain_users__account('bob').with({:ensure => 'present'}) }
+ end
+
+ context 'with bad parameter for hash' do
+ let(:params) do
+ {
+ :hash => 'fail'
+ }
+ end
+
+ it { should compile.and_raise_error(/\"fail\" is not a Hash/) }
+ end
end
| Update main users class unit tests.
|
diff --git a/no-style-please.gemspec b/no-style-please.gemspec
index abc1234..def5678 100644
--- a/no-style-please.gemspec
+++ b/no-style-please.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "no-style-please"
- spec.version = "0.4.5"
+ spec.version = "0.4.6"
spec.authors = ["Riccardo Graziosi"]
spec.email = ["riccardo.graziosi97@gmail.com"]
| Update gem version to 0.4.6
|
diff --git a/spec/app/root_spec.rb b/spec/app/root_spec.rb
index abc1234..def5678 100644
--- a/spec/app/root_spec.rb
+++ b/spec/app/root_spec.rb
@@ -23,11 +23,14 @@ end
it "should return a success response code" do
- last_response.should be_ok
+ puts last_response
+ #last_response.status.should eq(200)
+ #last_response.should be_ok
end
it "should return the proper content type" do
- last_response.headers["Content-Type"].should eq(JSON_CONTENT)
+ #last_response.headers["Content-Type"].should eq(JSON_CONTENT)
+ puts last_response.headers["Content-Type"]
end
end
| Comment test; docs not present on CI.
|
diff --git a/Casks/a-better-finder-attributes.rb b/Casks/a-better-finder-attributes.rb
index abc1234..def5678 100644
--- a/Casks/a-better-finder-attributes.rb
+++ b/Casks/a-better-finder-attributes.rb
@@ -0,0 +1,7 @@+class ABetterFinderAttributes < Cask
+ url 'http://www.publicspace.net/download/ABFAX.dmg'
+ homepage 'http://www.publicspace.net/ABetterFinderAttributes/'
+ version 'latest'
+ sha256 :no_check
+ link 'A Better Finder Attributes 5.app'
+end
| Add A Better Finder Attributes
|
diff --git a/lib/vcloud/net_launcher/net_launch.rb b/lib/vcloud/net_launcher/net_launch.rb
index abc1234..def5678 100644
--- a/lib/vcloud/net_launcher/net_launch.rb
+++ b/lib/vcloud/net_launcher/net_launch.rb
@@ -19,7 +19,7 @@ net_config[:fence_mode] ||= 'isolated'
Vcloud::Core.logger.info("Provisioning orgVdcNetwork #{net_config[:name]}.")
begin
- net = Vcloud::Core::OrgVdcNetwork.provision(net_config)
+ Vcloud::Core::OrgVdcNetwork.provision(net_config)
rescue RuntimeError => e
Vcloud::Core.logger.error("Could not provision orgVdcNetwork: #{e.message}")
raise
| Remove unused var assignment in NetLaunch
To fix lint warning:
```
lib/vcloud/net_launcher/net_launch.rb:22:13: W: Useless assignment to variable - net.
net = Vcloud::Core::OrgVdcNetwork.provision(net_config)
^^^
```
|
diff --git a/lib/weather_reporter/configuration.rb b/lib/weather_reporter/configuration.rb
index abc1234..def5678 100644
--- a/lib/weather_reporter/configuration.rb
+++ b/lib/weather_reporter/configuration.rb
@@ -26,7 +26,7 @@
def valid_yaml_syntax
unless file.instance_of?(Hash)
- raise WeatherReporter::Error::InvalidFile, 'Invalid file format'
+ raise WeatherReporter::Error::InvalidFile, 'Invalid syntax in yaml'
else
true
end
| Change exception message in method valid_yaml_syntax
Change message from Invalid file format to Invalid syntax in yaml
|
diff --git a/app/helpers/notification_helper.rb b/app/helpers/notification_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/notification_helper.rb
+++ b/app/helpers/notification_helper.rb
@@ -1,4 +1,4 @@-require_relative "../../lib/notification_file_lookup"
+require "notification_file_lookup"
module NotificationHelper
include ActionView::Helpers::TagHelper
| Fix require line in helper.
Was getting Undefined constant errors in dev randomly.
|
diff --git a/spec/features/submit_feedback_spec.rb b/spec/features/submit_feedback_spec.rb
index abc1234..def5678 100644
--- a/spec/features/submit_feedback_spec.rb
+++ b/spec/features/submit_feedback_spec.rb
@@ -18,50 +18,4 @@ end
custom_matchers = [:method, :uri, :host, :path, :valid_uuid, normalised_body]
-
- scenario 'including prisoner details', vcr: {
- match_requests_on: custom_matchers,
- cassette_name: :submit_feedback
- } do
- text = 'How many times did the Batmobile catch a flat?'
- email_address = 'user@test.example.com'
- prisoner_number = 'A1234BC'
- prisoner_dob_day = 1
- prisoner_dob_month = 1
- prisoner_dob_year = 1999
- prison_name = 'Leeds'
-
- visit booking_requests_path(locale: 'en')
- click_link 'Contact us'
-
- fill_in 'Your message', with: text
- fill_in 'Prisoner number', with: prisoner_number
- fill_in 'Day', with: prisoner_dob_day
- fill_in 'Month', with: prisoner_dob_month
- fill_in 'Year', with: prisoner_dob_year
- select_prison prison_name
- fill_in 'Your email address', with: email_address
-
- click_button 'Send'
-
- expect(page).to have_text('Thank you for your feedback')
- end
-
- scenario 'no prisoner details', vcr: {
- match_requests_on: custom_matchers,
- cassette_name: :submit_feedback_no_prisoner_details
- } do
- text = 'How many times did the Batmobile catch a flat?'
- email_address = 'user@test.example.com'
-
- visit booking_requests_path(locale: 'en')
- click_link 'Contact us'
-
- fill_in 'Your message', with: text
- fill_in 'Your email address', with: email_address
-
- click_button 'Send'
-
- expect(page).to have_text('Thank you for your feedback')
- end
end
| Remove tests around feedback form
|
diff --git a/spec/unit/plugins/windows/dmi_spec.rb b/spec/unit/plugins/windows/dmi_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/plugins/windows/dmi_spec.rb
+++ b/spec/unit/plugins/windows/dmi_spec.rb
@@ -0,0 +1,72 @@+#
+# Author:: Stuart Preston (<stuart@chef.io>)
+# Copyright:: Copyright (c) 2018, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+=begin
+CASES = {
+}
+=end
+
+require "spec_helper"
+
+describe Ohai::System, "DMI", :windows_only do
+ let(:plugin) { get_plugin("windows/dmi") }
+
+ CASES = [
+ ["Depth", "depth", "aaa",],
+ ["PartNumber", "part_number", "bbb",],
+ ["NumberOfPowerCords", "number_of_power_cords", "ccc",],
+ ["SKU", "sku", "ddd",],
+ ["SMBIOSAssetTag", "smbios_asset_tag", "eee",],
+ ["DeviceID", "device_id", "fff",],
+ ["L2CacheSize", "l2_cache_size", "ggg",],
+ ]
+
+ before do
+ require "wmi-lite/wmi"
+
+ properties = CASES.map do |name, _, value|
+ double(name: name, value: value)
+ end
+
+ wmi_ole_object = double properties_: properties
+
+ CASES.each do |name, _, value|
+ allow(wmi_ole_object).to receive(:invoke).with(name).and_return(value)
+ end
+
+ wmi_object = WmiLite::Wmi::Instance.new(wmi_ole_object)
+ expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_SystemEnclosure").and_return(wmi_object)
+
+ empty_wmi_object = WmiLite::Wmi::Instance.new(double(properties_: []))
+ %w[Processor Bios ComputerSystemProduct BaseBoard].each do |type|
+ expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_#{type}").and_return(empty_wmi_object)
+ end
+
+ plugin.run
+ end
+
+ CASES.each do |name, transformed_name, value|
+ it "adds #{name} to :all_records" do
+ expect(plugin[:dmi][:chassis][:all_records].first[name]).to eq(value)
+ end
+
+ it "adds #{transformed_name} to the root" do
+ expect(plugin[:dmi][:chassis][transformed_name]).to eq(value)
+ end
+ end
+end
| Add regression tests for Windows dmi plugin.
Signed-off-by: Pete Higgins <e3b6cda228242c30b711ac17cb264f1dbadfd0b6@peterhiggins.org>
|
diff --git a/app/services/post_stream_window.rb b/app/services/post_stream_window.rb
index abc1234..def5678 100644
--- a/app/services/post_stream_window.rb
+++ b/app/services/post_stream_window.rb
@@ -1,6 +1,6 @@ class PostStreamWindow
def self.for(topic:, from: (topic.highest_post_number+1), order: :desc, limit: SiteSetting.babble_page_size)
- lt_or_gt = (order.to_sym == :desc) ? '<' : '>'
+ lt_or_gt = (order.to_sym == :desc) ? '<=' : '>='
topic.posts.includes(:user)
.where("post_number #{lt_or_gt} ?", from)
.order(post_number: order)
| Use lt/gt or equal to in post stream window
|
diff --git a/spec/features/top_spec.rb b/spec/features/top_spec.rb
index abc1234..def5678 100644
--- a/spec/features/top_spec.rb
+++ b/spec/features/top_spec.rb
@@ -4,7 +4,7 @@ describe "GET /" do
scenario "Sponser links should be exist" do
visit "/"
- expect(page).to have_css 'section.sponsors_logo a[href]', count: 5
+ expect(page).to have_css 'section.sponsors_logo a[href]', count: 6
end
end
end
| Fix broken spec in Top
|
diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb
index abc1234..def5678 100644
--- a/spec/models/album_spec.rb
+++ b/spec/models/album_spec.rb
@@ -24,7 +24,7 @@ it 'must be deleted if the user is deleted' do
album = create(:album)
Album.all.count.should eq(1)
- album.user.delete
+ album.user.destroy
Album.all.count.should eq(0)
end
end
| Use destroy so callback is triggered
|
diff --git a/smart_logger.gemspec b/smart_logger.gemspec
index abc1234..def5678 100644
--- a/smart_logger.gemspec
+++ b/smart_logger.gemspec
@@ -6,7 +6,7 @@ s.description = "Smart grouping of log entries"
s.authors = ["Boris Dinkevich"]
s.email = 'do@itlater.com'
- s.homepage = 'http://rubygems.org/gems/smart_logger'
+ s.homepage = 'https://github.com/borisd/smart_logger'
s.files = ["lib/smart_logger.rb",
"lib/smart_logger/active_support.rb",
"lib/smart_logger/logger.rb",
| Change homepage to github page
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.