diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/spec/quantum_spec.rb b/spec/quantum_spec.rb
index abc1234..def5678 100644
--- a/spec/quantum_spec.rb
+++ b/spec/quantum_spec.rb
@@ -4,7 +4,7 @@ describe Quantum do
describe '.leap' do
- the_past = Time.new(1968, 03, 25, 15, 00)
+ the_past = Time.new(1956, 9, 13, 15, 00)
it 'changes the current time' do
Quantum.leap(the_past)
| Use the correct leap date for first episode
|
diff --git a/app/models/avatar.rb b/app/models/avatar.rb
index abc1234..def5678 100644
--- a/app/models/avatar.rb
+++ b/app/models/avatar.rb
@@ -15,6 +15,7 @@ folder: 'avatar/',
public_id: member.id,
allowed_formats: %w[jpg png],
+ invalidate: true,
)
update!(cloudinary_id: response['public_id'], metadata: response.except('public_id'))
end
| Add `invalidate: true` to Cloudinary upload parameters
close #1535
|
diff --git a/app/services/jira.rb b/app/services/jira.rb
index abc1234..def5678 100644
--- a/app/services/jira.rb
+++ b/app/services/jira.rb
@@ -11,7 +11,7 @@ def find_issues_by_project(project)
return [] if project.jira_key.blank?
- response = self.class.get("/search?project=" + project.jira_key)
+ response = self.class.get("/search?jql=project=" + project.jira_key)
return [] if response.code != 200
| Fix query string on Jira issue listing
|
diff --git a/RNDeviceInfo.podspec b/RNDeviceInfo.podspec
index abc1234..def5678 100644
--- a/RNDeviceInfo.podspec
+++ b/RNDeviceInfo.podspec
@@ -8,7 +8,7 @@ s.license = "MIT"
s.platform = :ios, "7.0"
- s.source = { :git => "https://github.com/rebeccahughes/react-native-device-info", :head }
+ s.source = { :git => "https://github.com/rebeccahughes/react-native-device-info" }
s.source_files = "RNDeviceInfo/*.{h,m}"
| Fix source in podspec file.
|
diff --git a/app/models/report.rb b/app/models/report.rb
index abc1234..def5678 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -16,9 +16,8 @@ end
def mark_occupations_as_selected(occupation_ids)
- occupations.where(id: occupation_ids).select do |occupation|
- occupation.selected = true
- occupation.save
+ occupations.where(id: occupation_ids).each do |occupation|
+ occupation.update_attribute(:selected, true)
end
end
| Refactor mark occupations as selected
|
diff --git a/app/controllers/account_activations_controller.rb b/app/controllers/account_activations_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/account_activations_controller.rb
+++ b/app/controllers/account_activations_controller.rb
@@ -1,5 +1,6 @@ class AccountActivationsController < ApplicationController
+ # Try to active account after user clicks link from email.
def edit
user = User.find_by(email: params[:email])
if user && !user.activated? && user.authenticated?(:activation, params[:id])
| Comment docs for account activations controller
|
diff --git a/app/controllers/devise/cas_sessions_controller.rb b/app/controllers/devise/cas_sessions_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/devise/cas_sessions_controller.rb
+++ b/app/controllers/devise/cas_sessions_controller.rb
@@ -1,4 +1,6 @@ class Devise::CasSessionsController < Devise::SessionsController
+ unloadable
+
def service
if signed_in?(resource_name)
redirect_to after_sign_in_path_for(resource_name)
| Make sessions controller unloadable to avoid dev mode errors
|
diff --git a/SDCAlertView.podspec b/SDCAlertView.podspec
index abc1234..def5678 100644
--- a/SDCAlertView.podspec
+++ b/SDCAlertView.podspec
@@ -9,7 +9,7 @@ # Source Info
s.platform = :ios, '7.0'
s.source = { :git => 'https://github.com/Scott90/SDCAlertView.git', :tag => "v#{s.version}" }
- s.source_files = 'SDCAlertView/SDCAlertView.{h,m}', 'SDCAlertView/SDCAlertViewController.{h,m}', 'SDCAlertView/SDCAlertViewContentView.{h,m}', 'SDCAlertView/SDCAlertViewBackgroundView.{h,m}', 'SDCAlertView/SDCAlertViewBackground.png', 'SDCAlertView/SDCAlertViewBackground@2x.png'
+ s.source_files = 'SDCAlertView/SDCAlertView.{h,m}', 'SDCAlertView/SDCAlertView_Private.h', 'SDCAlertView/SDCAlertViewController.{h,m}', 'SDCAlertView/SDCAlertViewContentView.{h,m}', 'SDCAlertView/SDCAlertViewBackgroundView.{h,m}', 'SDCAlertView/SDCAlertViewBackground.png', 'SDCAlertView/SDCAlertViewBackground@2x.png'
s.requires_arc = true
| Update podspec to include private header file
|
diff --git a/GestureRecognizerClosures.podspec b/GestureRecognizerClosures.podspec
index abc1234..def5678 100644
--- a/GestureRecognizerClosures.podspec
+++ b/GestureRecognizerClosures.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "GestureRecognizerClosures"
- s.version = "2.1.0"
+ s.version = "2.2.0"
s.license = "MIT"
s.summary = "Closure support for handling gesture recognizers in Swift."
s.homepage = "https://github.com/marcbaldwin/GestureRecognizerClosures"
| Update podspec version to 2.2.0
|
diff --git a/app/workers/feed_eater_worker.rb b/app/workers/feed_eater_worker.rb
index abc1234..def5678 100644
--- a/app/workers/feed_eater_worker.rb
+++ b/app/workers/feed_eater_worker.rb
@@ -9,8 +9,15 @@ logger.info '1. Checking for new feeds'
python = './virtualenv/bin/python'
updated = `#{python} ./lib/feedeater/check.py #{feed_onestop_ids.join(' ')}`
- updated = updated.split()
+ if updated
+ updated = updated.split()
+ else
+ updated = []
+ end
logger.info " -> #{updated.join(' ')}"
+ if updated.length == 0
+ return
+ end
logger.info '2. Downloading feeds that have been updated'
system "#{python} ./lib/feedeater/fetch.py #{updated.join(' ')}"
| Return if no updated feeds
|
diff --git a/app/services/curation_concerns/embargo_service.rb b/app/services/curation_concerns/embargo_service.rb
index abc1234..def5678 100644
--- a/app/services/curation_concerns/embargo_service.rb
+++ b/app/services/curation_concerns/embargo_service.rb
@@ -30,19 +30,6 @@ def presenter_class
CurationConcerns::EmbargoPresenter
end
-
- def presenters(builder)
- response = repository.search(builder)
- response.documents.map { |d| presenter_class.new(d) }
- end
-
- def repository
- config.repository
- end
-
- def config
- @config ||= ::CatalogController.new
- end
end
end
end
| Remove duplicate methods in EmbargoService
These are already inherited in identical form from the
`RestrictionService` base.
|
diff --git a/event_sourcing.gemspec b/event_sourcing.gemspec
index abc1234..def5678 100644
--- a/event_sourcing.gemspec
+++ b/event_sourcing.gemspec
@@ -17,13 +17,13 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
- spec.add_dependency "values"
+ spec.add_dependency "values", "~> 1.5"
spec.add_dependency "concurrent-ruby", "~> 0.7.1"
- spec.add_development_dependency "bundler", "~> 1.6"
+ spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake"
- spec.add_development_dependency "rspec"
- spec.add_development_dependency "spinach"
+ spec.add_development_dependency "rspec", "~> 3.1"
+ spec.add_development_dependency "spinach", "~> 0.8.10"
spec.add_development_dependency "guard-spinach"
spec.add_development_dependency "guard-rspec"
end
| Make required gem versions more specific
|
diff --git a/app/inputs/rich_input.rb b/app/inputs/rich_input.rb
index abc1234..def5678 100644
--- a/app/inputs/rich_input.rb
+++ b/app/inputs/rich_input.rb
@@ -5,7 +5,11 @@
scope_type = object_name
scope_id = object.id
- editor_options = Rich.options(options[:config], scope_type, scope_id)
+ editor_options = Rich.options(
+ options[:config],
+ options[:config].fetch(:scope_type, scope_type),
+ options[:config].fetch(:scope_id, scope_id)
+ )
input_wrapping do
label_html <<
| Fix use rich files per user
This fix use rich files per user.
In ActiveAdmin you can write such as:
f.input :body, as: :rich, config: { scoped: true, scope_type: 'user', scoped_id: current_user.id } |
diff --git a/app/controllers/admin/rooms_controller.rb b/app/controllers/admin/rooms_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/admin/rooms_controller.rb
+++ b/app/controllers/admin/rooms_controller.rb
@@ -31,7 +31,7 @@ def destroy
@room = Room.find(params[:id])
@room.destroy
- respond_with(@role, :location => admin_roles_path)
+ respond_with(@role, :location => admin_rooms_path)
end
private
| Fix a typo on redirecting
|
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
@@ -12,7 +12,12 @@ end
def edit
+ show
add_breadcrumb I18n.t("views.users.edit"), edit_admin_user_path
+ end
+
+ def show
+ add_breadcrumb user.name , admin_user_path(user)
end
def create
| Add link to show before to edit in breadcrumbs users
|
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
@@ -20,12 +20,12 @@ private
def evidence_check_enabled?
- Settings.evidence_check.enabled == true
+ Settings.evidence_check.enabled.equal?(true)
end
helper_method :evidence_check_enabled?
def payment_enabled?
- Settings.payment.enabled == true
+ Settings.payment.enabled.equal?(true)
end
helper_method :payment_enabled?
end
| Improve feature toggle condition handling
|
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
@@ -5,10 +5,10 @@
def set_locale
# On the first visit, look at Accept-language and select the preferred language
- if !cookies[:lang_autodetected]
+ if !session[:lang_autodetected]
I18n.locale = extract_locale_from_header
if I18n.locale != I18n.default_locale && Language.find_by_code(I18n.locale)
- cookies[:lang_autodetected] = true
+ session[:lang_autodetected] = true
redirect_to url_for locale: I18n.locale # Redirect to the same page, different locale.
end
else
| Use sessions instead of cookies for locale tracking.
|
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
@@ -16,7 +16,7 @@
# Show additional warnings if member is a founding member
fop = co.found_organisation_proposals.last
- unless fop && current_user.created_at >= fop.creation_date
+ if fop && @member.created_at < fop.creation_date
@show_founding_warnings = true
end
else
| Fix condition bug when choosing whether to show founders' warnings.
|
diff --git a/app/views/categories/rss_feed.rss.builder b/app/views/categories/rss_feed.rss.builder
index abc1234..def5678 100644
--- a/app/views/categories/rss_feed.rss.builder
+++ b/app/views/categories/rss_feed.rss.builder
@@ -6,7 +6,7 @@ xml.name "#{SiteSetting['SiteName']} - Codidact"
end
xml.link nil, rel: 'self', href: category_url(@category)
- xml.updated @posts.maximum(:created_at)&.iso8601 || RequestContext.community.created_at&.iso8601
+ xml.updated @posts.maximum(:last_activity)&.iso8601 || RequestContext.community.created_at&.iso8601
@posts.each do |post|
xml.entry do
@@ -17,7 +17,7 @@ xml.uri user_url(post.user)
end
xml.published post.created_at&.iso8601
- xml.updated post.updated_at&.iso8601
+ xml.updated post.last_activity&.iso8601
xml.link href: question_path(post)
xml.summary post.body.truncate(200), type: 'html'
end
| Order feeds by last activity
|
diff --git a/Casks/kindle.rb b/Casks/kindle.rb
index abc1234..def5678 100644
--- a/Casks/kindle.rb
+++ b/Casks/kindle.rb
@@ -1,8 +1,8 @@ cask :v1 => 'kindle' do
- version '40961'
- sha256 '5036fef92ccb2334afd5c3e6c92ae56dccd5d9d120c005264044fa64147ff538'
+ version '41015'
+ sha256 '1c15ce4df69044dc9d2d3562b7f5a8589b65efa5b8e64bc2bcdd7ed41c05df38'
- url "http://kindleformac.amazon.com/#{version}/KindleForMac.dmg"
+ url "http://kindleformac.amazon.com/#{version}/KindleForMac-#{version}.dmg"
name 'Kindle for Mac'
homepage 'https://www.amazon.com/gp/digital/fiona/kcp-landing-page'
license :gratis
@@ -13,5 +13,6 @@ '~/Library/Preferences/com.amazon.Kindle.plist',
'~/Library/Application Support/Kindle/',
'~/Library/Saved Application State/com.amazon.Kindle.savedState/',
+ '~/Library/Caches/com.amazon.Kindle-Crash-Reporter/'
]
end
| Upgrade Kindle.app to v1.12.4 (41015)
|
diff --git a/TBOOMDetector.podspec b/TBOOMDetector.podspec
index abc1234..def5678 100644
--- a/TBOOMDetector.podspec
+++ b/TBOOMDetector.podspec
@@ -19,5 +19,7 @@ s.source = { :git => "https://github.com/trailbehind/TBOOMDetector.git", :tag => "0.6" }
s.source_files = "TBOOMDetector/*.{h,m,c}"
+ s.dependency 'Crashlytics', '~> 3'
+ s.static_framework = true
end
| Add Crashlytics dependency back to podspec and add static_framework = true
|
diff --git a/db/migrate/20150114162455_create_users.rb b/db/migrate/20150114162455_create_users.rb
index abc1234..def5678 100644
--- a/db/migrate/20150114162455_create_users.rb
+++ b/db/migrate/20150114162455_create_users.rb
@@ -2,7 +2,7 @@ def change
create_table :users do |t|
t.string :username, null: false
- t.string :password, null: false
+ t.string :password_digest, null: false
t.timestamps null: false
end
| Fix password error with password_digest.
|
diff --git a/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb b/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
index abc1234..def5678 100644
--- a/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
+++ b/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
@@ -0,0 +1,14 @@+class AddMoreFieldsToTradeUploads < ActiveRecord::Migration
+ def change
+ add_column :trade_annual_report_uploads, :is_from_epix, :boolean, default: false
+ add_column :trade_annual_report_uploads, :is_from_web_service, :boolean, default: false
+ add_column :trade_annual_report_uploads, :number_of_records_submitted, :integer
+ add_column :trade_annual_report_uploads, :auto_reminder_sent_at, :date
+ add_column :trade_annual_report_uploads, :sandbox_transferred_at, :date
+ add_column :trade_annual_report_uploads, :sandbox_transferred_by_id, :integer
+ add_column :trade_annual_report_uploads, :submitted_at, :date
+ add_column :trade_annual_report_uploads, :submitted_by_id, :integer
+ add_column :trade_annual_report_uploads, :deleted_at, :date
+ add_column :trade_annual_report_uploads, :deleted_by_id, :integer
+ end
+end
| Add migration to add fields to annual report uploads
|
diff --git a/AttributedLib.podspec b/AttributedLib.podspec
index abc1234..def5678 100644
--- a/AttributedLib.podspec
+++ b/AttributedLib.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = 'AttributedLib'
- s.version = '0.1.2'
+ s.version = '0.2.0'
s.summary = 'A Modern interface for attributed strings.'
s.description = <<-DESC
| Update podspec to point to release for 0.2.0
|
diff --git a/rails-bootstrap-helpers.gemspec b/rails-bootstrap-helpers.gemspec
index abc1234..def5678 100644
--- a/rails-bootstrap-helpers.gemspec
+++ b/rails-bootstrap-helpers.gemspec
@@ -10,6 +10,7 @@ s.homepage = "https://github.com/Tretti/rails-bootstrap-helpers"
s.summary = "A Rails plugin that contains helpers for Bootstrap"
s.description = "A Rails plugin that contains helpers for Bootstrap"
+ s.license = "MIT"
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["spec/**/*"]
| Add license info to gemspec.
|
diff --git a/lib/suspenders/generators/import_dump_generator.rb b/lib/suspenders/generators/import_dump_generator.rb
index abc1234..def5678 100644
--- a/lib/suspenders/generators/import_dump_generator.rb
+++ b/lib/suspenders/generators/import_dump_generator.rb
@@ -17,6 +17,22 @@
% ./bin/import_dump staging
% ./bin/import_dump production
+
+ ## Resetting a database
+
+ If you want to reset (destroy and recreate) a database on Heroku, you
+ cannot use `heroku run rake db:drop`, instead use:
+
+ % heroku pg:reset DATABASE_URL --remote=staging
+
+ ( source: https://devcenter.heroku.com/articles/heroku-postgresql#pg-reset )
+
+ Remeber to create a new backup schedule if you reset your database!
+
+ % heroku pg:backups:schedule DATABASE_URL --at '2:00 UTC' --remote=staging
+
+ ( source: https://devcenter.heroku.com/articles/heroku-postgres-backups#scheduling-backups )
+
MARKDOWN
append_file "README.md", instructions
| Add info about resetting database on heroku
|
diff --git a/test/rake_test.rb b/test/rake_test.rb
index abc1234..def5678 100644
--- a/test/rake_test.rb
+++ b/test/rake_test.rb
@@ -2,34 +2,39 @@ require "test_helper"
require "mocha"
-context "rake" do
- setup do
+describe "rake tasks" do
+ before do
Rake.application.rake_require "tasks/resque"
end
- def run_rake_task
- Rake::Task["resque:work"].reenable
- Rake.application.invoke_task "resque:work"
+ describe 'resque:work' do
+
+ it "requires QUEUE environment variable" do
+ begin
+ run_rake_task("resque:work")
+ fail 'Expected task to abort'
+ rescue Exception => e
+ assert_equal e.message, "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
+ assert_equal e.class, SystemExit
+ end
+ end
+
+ it "works when multiple queues specified" do
+ begin
+ old_queues = ENV["QUEUES"]
+ ENV["QUEUES"] = "high,low"
+ Resque::Worker.any_instance.expects(:work)
+ run_rake_task("resque:work")
+ ensure
+ ENV["QUEUES"] = old_queues
+ end
+ end
+
end
- test "requires QUEUE environment variable" do
- begin
- run_rake_task
- fail 'Expected task to abort'
- rescue Exception => e
- assert_equal e.message, "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
- assert_equal e.class, SystemExit
- end
+ def run_rake_task(name)
+ Rake::Task[name].reenable
+ Rake.application.invoke_task(name)
end
- test "works when multiple queues specified" do
- begin
- old_queues = ENV["QUEUES"]
- ENV["QUEUES"] = "high,low"
- Resque::Worker.any_instance.expects(:work)
- run_rake_task
- ensure
- ENV["QUEUES"] = old_queues
- end
- end
end
| Refactor tests in preparation of testing more rake tasks
|
diff --git a/elementary-rpc.gemspec b/elementary-rpc.gemspec
index abc1234..def5678 100644
--- a/elementary-rpc.gemspec
+++ b/elementary-rpc.gemspec
@@ -5,12 +5,12 @@
Gem::Specification.new do |spec|
spec.name = "elementary-rpc"
- spec.version = Elementary::VERSION
+ spec.version = [Elementary::VERSION, ENV['TRAVIS_BUILD_NUMBER'] || 'dev'].join('.')
spec.authors = ["R. Tyler Croy"]
spec.email = ["tyler@monkeypox.org"]
spec.summary = "Gem supporting Protobuf RPC in a simple way"
- spec.description = "BLANK"
- spec.homepage = ""
+ spec.description = "Gem supporting Protobuf RPC over HTTP with futures and fun"
+ spec.homepage = "https://github.com/lookout/elementary-rpc"
spec.license = "MIT"
spec.files = `git ls-files -z`.split("\x0")
| Make the gemspec add a build version onto the gems released version
|
diff --git a/MQTTKit.podspec b/MQTTKit.podspec
index abc1234..def5678 100644
--- a/MQTTKit.podspec
+++ b/MQTTKit.podspec
@@ -6,7 +6,8 @@ s.homepage = "http://github.com/jmesnil/MQTTKit"
s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
s.author = { "Jeff Mesnil" => "jmesnil@gmail.com" }
- s.platform = :ios, '5.0'
+ s.ios.platform = :ios, '5.0'
+ s.osx.platform = :osx, '10.9'
s.source = { :git => "https://github.com/jmesnil/MQTTKit.git", :tag => "#{s.version}" }
s.source_files = 'libmosquitto/*.{h,c}', 'MQTTKit/*.{h,m}'
| Add OSX support to podspec |
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -17,10 +17,6 @@ format_plain = MapLayers::JsVar.new("format_plain")
page.assign(format_plain, OpenLayers::Format::GeoJSON.new)
- vectorlayer = MapLayers::JsVar.new("vectorlayer")
- page.assign(vectorlayer, OpenLayers::Layer::Vector.new("Vectors", projection: projection))
- page << map.add_layer(vectorlayer)
-
yield(map, page) if block_given?
end
end
| Remove the vectorlayer definition from the helper, for now
|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -22,6 +22,6 @@ def section_meta_tags(artefact)
return '' if artefact.nil? or artefact.section.blank?
tag(:meta, {name: 'x-section-name', content: artefact.section}, true) +
- tag(:meta, {name: 'x-section-link', content: "/#{artefact.section.parameterize}"}, true)
+ tag(:meta, {name: 'x-section-link', content: "/browse/#{artefact.section.parameterize}"}, true)
end
end
| Add /browse to all section links
|
diff --git a/sidekiq-batch.gemspec b/sidekiq-batch.gemspec
index abc1234..def5678 100644
--- a/sidekiq-batch.gemspec
+++ b/sidekiq-batch.gemspec
@@ -22,7 +22,7 @@ spec.add_dependency "sidekiq", ">= 3"
spec.add_development_dependency "bundler", "~> 1.12"
- spec.add_development_dependency "rake", "~> 10.0"
+ spec.add_development_dependency "rake", "~> 12.3"
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "fakeredis", "~> 0.7.0"
end
| Update rake requirement from ~> 10.0 to ~> 12.3
Updates the requirements on [rake](https://github.com/ruby/rake) to permit the latest version.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/rake-10.0.0...v12.3.3)
Signed-off-by: dependabot-preview[bot] <5bdcd3c0d4d24ae3e71b3b452a024c6324c7e4bb@dependabot.com> |
diff --git a/app/models/biodiversity_report.rb b/app/models/biodiversity_report.rb
index abc1234..def5678 100644
--- a/app/models/biodiversity_report.rb
+++ b/app/models/biodiversity_report.rb
@@ -24,7 +24,7 @@ end
def byline
- "by #{author} on #{measured_on.to_formatted_s(:long)} at #{measured_at.to_formatted_s(:ampm)}"
+ "by #{author} on #{measured_on&.to_formatted_s(:long)} at #{measured_at&.to_formatted_s(:ampm)}"
end
def user
| Allow nil values for byline
|
diff --git a/lib/high_roller/random/pseudo.rb b/lib/high_roller/random/pseudo.rb
index abc1234..def5678 100644
--- a/lib/high_roller/random/pseudo.rb
+++ b/lib/high_roller/random/pseudo.rb
@@ -7,7 +7,7 @@ ary = []
@preload.times do
- ary << rand(1..rad)
+ ary << do_rand(1..rad)
end
out[rad] = ary
@@ -15,4 +15,15 @@
out
end
+
+ private
+
+ def do_rand range
+ if RUBY_VERSION >= "1.9.3"
+ rand(range)
+ else
+ @rng ||= ::Random.new
+ @rng.rand(range)
+ end
+ end
end
| Fix PRNG delegate for 1.9.2
|
diff --git a/lib/munge/cli/commands/server.rb b/lib/munge/cli/commands/server.rb
index abc1234..def5678 100644
--- a/lib/munge/cli/commands/server.rb
+++ b/lib/munge/cli/commands/server.rb
@@ -23,9 +23,7 @@ require "listen"
Listen.to(@bootloader.root_path) do |modified, added, removed|
- Dir.chdir(@bootloader.root_path) do
- system("munge build")
- end
+ system("munge build")
end
end
end
| Remove one level of chdir
Removing the chdir removes a warning about conflicting chdirs
|
diff --git a/lib/voicemail/storage_generic.rb b/lib/voicemail/storage_generic.rb
index abc1234..def5678 100644
--- a/lib/voicemail/storage_generic.rb
+++ b/lib/voicemail/storage_generic.rb
@@ -0,0 +1,110 @@+module Voicemail
+ class StorageGeneric
+ def initialize
+ end
+
+ #
+ # Get the mailbox with the specified ID
+ #
+ # @param mailbox_id The ID of the mailbox to fetch
+ #
+ def get_mailbox(mailbox_id)
+ end
+
+ #
+ # Count the specified mailbox's messages of the specified type
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param type[Symbol] The type of message to count (defaults to :new and :saved)
+ #
+ # @return [Fixnum] the number of messages
+ #
+ def count_messages(mailbox_id, type)
+ end
+
+ #
+ # Gets the specified mailbox's next message of the specified type
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param type[Symbol] The type of message to get (see #count_messages)
+ #
+ # @return [Hash] The message hash
+ #
+ def next_message(mailbox_id, type)
+ end
+
+ #
+ # Change a message's type, e.g. from :new to :saved or vice versa
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param message_id The message's ID
+ # @param from[Symbol] the current type of the message
+ # @param to[Symbol] the desired type of the message
+ #
+ def change_message_type(mailbox_id, message_id, from, to)
+ end
+
+ #
+ # Deletes the specified message
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param message_id The message's ID
+ # @param type[Symbol] The message's type
+ #
+ def delete_message(mailbox_id, message_id, type)
+ end
+
+ #
+ # Changes the mailbox's greeting to the one specified
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param recording_uri[String] Where to find the recording of the greeting
+ #
+ def save_greeting_for_mailbox(mailbox_id, recording_uri)
+ end
+
+ #
+ # Removes any custom greeting set for the mailbox
+ #
+ # @param mailbox_id The mailbox's ID
+ #
+ def delete_greeting_from_mailbox(mailbox_id)
+ end
+
+ #
+ # Changes the PIN for the mailbox
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param new_pin[String] The new PIN for the mailbox
+ #
+ def change_pin_for_mailbox(mailbox_id, new_pin)
+ end
+
+ #
+ # Saves a recorded voicemail message to the mailbox
+ #
+ # @param mailbox_id The mailbox's ID
+ # @param type[Symbol] The type of message to be created (e.g. :new or :saved)
+ # @param from[String] The phone number of the message's sender
+ # @param recording_object[Punchblock::Component::Record] The recording result from Adhearsion
+ #
+ def save_recording(mailbox_id, type, from, recording_object)
+ end
+
+ def create_mailbox
+ end
+
+ private
+
+ #
+ # Initializes the mailbox system schema if there isn't one already.
+ # If implemented in a custom storage class, this method should not overwrite existing any existing schema.
+ #
+ def setup_schema
+ end
+
+ def config
+ Voicemail::Plugin.config
+ end
+ end
+end
| Add a generic storage class
This storage class does nothing except provide a place for voicemail's storage API to be documented.
|
diff --git a/config/initializers/gds-sso.rb b/config/initializers/gds-sso.rb
index abc1234..def5678 100644
--- a/config/initializers/gds-sso.rb
+++ b/config/initializers/gds-sso.rb
@@ -2,6 +2,6 @@ config.user_model = "User"
config.oauth_id = ENV["OAUTH_ID"] || "abcdefghjasndjkasndassetmanager"
config.oauth_secret = ENV["OAUTH_SECRET"] || "secret"
- config.oauth_root_url = Plek.current.external_url_for("signon")
+ config.oauth_root_url = Plek.new.external_url_for("signon")
config.cache = Rails.cache
end
| Use Plek.new instead of Plek.current
As per https://github.com/alphagov/plek/blob/3b838fd022a5890946a3a3ce7e774d758e0c6320/lib/plek.rb#L148-L152.
|
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -4,10 +4,6 @@
When /^(.*) within a cassette named "([^"]*)"$/ do |step_to_call, cassette_name|
VCR.use_cassette(cassette_name) { step step_to_call }
-end
-
-Then /^the response should be "([^"]*)"$/ do |expected_response|
- @response.status.should eql expected_response.to_i
end
Then /^the response should equal (.*)$/ do |expected_response|
@@ -22,7 +18,11 @@ @response.should == expected
end
-Then /^the response type should be "([^"]*)"$/ do |type|
+Then /^the response status should be (.*)$/ do |expected_response|
+ @response.status.should eql expected_response.to_i
+end
+
+Then /^the response type should be (.*)$/ do |type|
@response.content_type.should =~ /application\/#{type.downcase}/
end
@@ -33,3 +33,10 @@ Then /^the response should not be empty$/ do
@response.should_not be_empty
end
+
+Then /^the response should contain (.*)$/ do |item|
+ case @response.body
+ when Array
+ @response.body.should include item
+ end
+end
| Add step for inspecting request body.
|
diff --git a/config/initializers/twitter.rb b/config/initializers/twitter.rb
index abc1234..def5678 100644
--- a/config/initializers/twitter.rb
+++ b/config/initializers/twitter.rb
@@ -0,0 +1,12 @@+begin
+ twitter_config = YAML.load(File.open("#{Rails.root}/config/twitter.yml"))
+rescue Errno::ENOENT => exception
+ twitter_config = {}
+end
+
+Twitter.configure do |config|
+ config.consumer_key = twitter_config["CONSUMER_KEY"] || ENV["TWITTER_CONSUMER_KEY"]
+ config.consumer_secret = twitter_config["CONSUMER_SECRET"] || ENV["TWITTER_CONSUMER_SECRET"]
+ config.oauth_token = twitter_config["OAUTH_TOKEN"] || ENV["TWITTER_OAUTH_TOKEN"]
+ config.oauth_token_secret = twitter_config["OAUTH_TOKEN_SECRET"] || ENV["TWITTER_OAUTH_TOKEN_SECRET"]
+end | Allow configuration to be loaded from yaml.
|
diff --git a/Scatter.podspec b/Scatter.podspec
index abc1234..def5678 100644
--- a/Scatter.podspec
+++ b/Scatter.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "Scatter"
- s.version = "0.2.0"
+ s.version = "0.2"
s.homepage = "https://github.com/hyperoslo/Scatter"
s.license = 'MIT'
s.author = { "Hyper AS" => "teknologi@hyper.no" }
| Fix version number in podspec
|
diff --git a/lib/core_extensions/rubify_keys.rb b/lib/core_extensions/rubify_keys.rb
index abc1234..def5678 100644
--- a/lib/core_extensions/rubify_keys.rb
+++ b/lib/core_extensions/rubify_keys.rb
@@ -1,7 +1,8 @@ module CoreExtensions
module RubifyKeys
- # Creates methods #rubify_keys! and #unrubify_keys!
+ # Dynamically creates methods #rubify_keys! and #unrubify_keys!, each of which
+ # modify the object in place
{"rubify" => "snake_case", "unrubify" => "camel_case"}.each do |name, kase|
method_name = "#{name}_keys!"
define_method(method_name) do
@@ -10,7 +11,8 @@ val = delete(key)
new_key = self.send("convert_to_#{kase}", key.to_s)
self[new_key] = val
- val.send(method_name) if val.is_a?(Hash)
+ # Recursively call method on any nested hashes
+ val.send(method_name) if val.is_a?(Hash)
val.each { |p| p.send(method_name) if p.is_a?(Hash) } if val.is_a?(Array)
end
self
| Add comments to confusing metaprogramming
|
diff --git a/lib/fluffle/handlers/dispatcher.rb b/lib/fluffle/handlers/dispatcher.rb
index abc1234..def5678 100644
--- a/lib/fluffle/handlers/dispatcher.rb
+++ b/lib/fluffle/handlers/dispatcher.rb
@@ -1,5 +1,17 @@ module Fluffle
module Handlers
+ # Lightweight DSL for defining handler blocks for a given message
+ #
+ # Examples
+ #
+ # dispatcher = Fluffle::Handlers::Dispatcher.new
+ # dispatcher.handle('upcase') { |str| str.upcase }
+ #
+ # # Also exposed through the `Fluffle::Server#drain` method
+ # server.drain do |dispatcher|
+ # dispatcher.handle('upcase') { |str| str.upcase }
+ # end
+ #
class Dispatcher < Base
def initialize
@routes = []
| Add some documentation for the `Dispatcher` handler
|
diff --git a/lib/rack/bug/filtered_backtrace.rb b/lib/rack/bug/filtered_backtrace.rb
index abc1234..def5678 100644
--- a/lib/rack/bug/filtered_backtrace.rb
+++ b/lib/rack/bug/filtered_backtrace.rb
@@ -31,7 +31,7 @@ nil
end
sub_path ? ::File.join(root, sub_path) : root
- end
+ end.to_s
end
end
end
| Fix for type mismatch: Pathname given
lib/rack/bug/filtered_backtrace.rb:16:in `index'
|
diff --git a/lib/serverspec/helper/detect_os.rb b/lib/serverspec/helper/detect_os.rb
index abc1234..def5678 100644
--- a/lib/serverspec/helper/detect_os.rb
+++ b/lib/serverspec/helper/detect_os.rb
@@ -9,6 +9,7 @@ os = property[:os_by_host][host]
else
os = backend(Serverspec::Commands::Base).check_os
+ property[:os_by_host][host] = os
end
self.class.const_get('Serverspec').const_get('Commands').const_get(os[:family]).new
| Delete os type cache by mistake, so rececover it
|
diff --git a/lib/tomcat-manager/api/version7.rb b/lib/tomcat-manager/api/version7.rb
index abc1234..def5678 100644
--- a/lib/tomcat-manager/api/version7.rb
+++ b/lib/tomcat-manager/api/version7.rb
@@ -36,6 +36,10 @@ def application_deployed?(application_name, version, response)
! deployed_applications(response)["/#{application_name}-#{version}"].nil?
end
+
+ def application_running?(application_name, version, response)
+ deployed_applications(response)["/#{application_name}-#{version}"][:status] == "running"
+ end
end
end
end
| Add application_running? Method for Version7
Update the Version7 class to include an application_running? method.
|
diff --git a/lib/tumblargh/renderer/document.rb b/lib/tumblargh/renderer/document.rb
index abc1234..def5678 100644
--- a/lib/tumblargh/renderer/document.rb
+++ b/lib/tumblargh/renderer/document.rb
@@ -46,7 +46,7 @@ end
def custom_value_for_type(type, key)
- config[type][key] rescue "No config for #{type} #{key}"
+ config[type][key] rescue raise "No appearance option for #{type}:#{key}"
end
# END TAGS ------
| Raise an error when trying to access an appearance option that does not exist
|
diff --git a/app/helpers/admin/races_helper.rb b/app/helpers/admin/races_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/admin/races_helper.rb
+++ b/app/helpers/admin/races_helper.rb
@@ -12,4 +12,16 @@
html
end
+
+ # BAR category or Rider Rankings category
+ def competition_category_name(race)
+ if race && race.category
+ if race.category.parent
+ return race.category.parent.name
+ else
+ return race.category.name
+ end
+ end
+ ""
+ end
end | Add helper method for race categories
|
diff --git a/app/jobs/push_user_updates_job.rb b/app/jobs/push_user_updates_job.rb
index abc1234..def5678 100644
--- a/app/jobs/push_user_updates_job.rb
+++ b/app/jobs/push_user_updates_job.rb
@@ -1,9 +1,5 @@ class PushUserUpdatesJob < ActiveJob::Base
- include ActiveJob::Retry
-
- def self.inherited(subclass)
- subclass.exponential_retry limit: 6
- end
+ include ActiveJob::Retry.new(strategy: :exponential, limit: 6)
def perform(*args)
raise NotImplementedError, "PushUserUpdatesJob must be subclassed"
| Use correct syntax for ActiveJob::Retry
Now specify options on the module as you include it
|
diff --git a/app/models/concerns/searchable.rb b/app/models/concerns/searchable.rb
index abc1234..def5678 100644
--- a/app/models/concerns/searchable.rb
+++ b/app/models/concerns/searchable.rb
@@ -12,7 +12,7 @@ skip_callback(:destroy, :after, :es_delete)
# background indexing
- after_save :delay_es_index
+ after_commit :delay_es_index
after_destroy :delay_es_delete
end
| Index after the record has been committed
This avoids the common race condition that I always forget about:
https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345
|
diff --git a/alchemy_spree.gemspec b/alchemy_spree.gemspec
index abc1234..def5678 100644
--- a/alchemy_spree.gemspec
+++ b/alchemy_spree.gemspec
@@ -16,5 +16,5 @@ gem.version = Alchemy::Spree::VERSION
gem.add_dependency('alchemy_cms', ['~> 3.0.0.rc4'])
- gem.add_dependency('spree', ['~> 2.1.5'])
+ gem.add_dependency('spree', ['>= 2.1', '< 3.0'])
end
| Allow spree 2.1 and 2.2
|
diff --git a/betabot.gemspec b/betabot.gemspec
index abc1234..def5678 100644
--- a/betabot.gemspec
+++ b/betabot.gemspec
@@ -9,7 +9,7 @@ s.homepage = 'https://github.com/gyng/betabot/'
s.metadata = {}
- s.add_development_dependency 'sequel'
- s.add_development_dependency 'sqlite3'
- s.add_development_dependency 'git'
+ s.add_runtime_dependency 'sequel'
+ s.add_runtime_dependency 'sqlite3'
+ s.add_runtime_dependency 'git'
end
| Load dependencies as runtime dependencies instead of dev
|
diff --git a/lib/fog/compute/google/models/instance_group_managers.rb b/lib/fog/compute/google/models/instance_group_managers.rb
index abc1234..def5678 100644
--- a/lib/fog/compute/google/models/instance_group_managers.rb
+++ b/lib/fog/compute/google/models/instance_group_managers.rb
@@ -12,10 +12,11 @@ :order_by => order_by,
:page_token => page_token
}
- data = []
+
if zone
- data += service.list_instance_group_managers(zone, opts).items || []
+ data = service.list_instance_group_managers(zone, opts).items || []
else
+ data = []
service.list_aggregated_instance_group_managers(opts).items.each_value do |group|
data.concat(group.instance_group_managers) if group.instance_group_managers
end
| Bring the IGM query to common format
It’s less elegant but should more gracefully fail if service.list_instance_group_managers(zone, opts).items returns nonsense (`false` for example)
|
diff --git a/solutions/uri/1005/1005.rb b/solutions/uri/1005/1005.rb
index abc1234..def5678 100644
--- a/solutions/uri/1005/1005.rb
+++ b/solutions/uri/1005/1005.rb
@@ -0,0 +1,4 @@+a = gets.to_f
+b = gets.to_f
+
+puts "MEDIA = #{'%.5f' % ((a * 3.5 + b * 7.5) / 11.0)}"
| Solve Average 1 in ruby
|
diff --git a/cache_rocket.gemspec b/cache_rocket.gemspec
index abc1234..def5678 100644
--- a/cache_rocket.gemspec
+++ b/cache_rocket.gemspec
@@ -22,7 +22,6 @@ spec.add_dependency "actionpack", ">= 3.2"
spec.add_development_dependency "rake", "~> 10.0"
- spec.add_development_dependency "minitest"
spec.add_development_dependency "mocha", "~> 1.0"
spec.add_development_dependency "pry", "~> 0.9"
end
| Remove explicit dependency on minitest
|
diff --git a/cache_rocket.gemspec b/cache_rocket.gemspec
index abc1234..def5678 100644
--- a/cache_rocket.gemspec
+++ b/cache_rocket.gemspec
@@ -21,6 +21,6 @@
spec.add_dependency "actionpack", ">= 3.2"
- spec.add_development_dependency "rake", "~> 10.0"
- spec.add_development_dependency "mocha", "~> 1.0"
+ spec.add_development_dependency "rake", "~> 10.3"
+ spec.add_development_dependency "mocha", "~> 1.1"
end
| Update development gem dependencies for rake, mocha
|
diff --git a/spec/divvy_up/list_spec.rb b/spec/divvy_up/list_spec.rb
index abc1234..def5678 100644
--- a/spec/divvy_up/list_spec.rb
+++ b/spec/divvy_up/list_spec.rb
@@ -1,17 +1,6 @@ module DivvyUp
describe List do
-
- it "exists" do
- expect(DivvyUp::List)
- end
-
- it "creates a new list" do
- list = DivvyUp::List.new({juice: 3, apple: 1.20, chicken: 7.99})
- expect(list.items).to eql({juice: 3, apple: 1.20, chicken: 7.99})
- end
-
- it "splits a list into one group" do
- items = {
+ let(:shopping_list) { {
orange_juice: 3,
lettuce: 7,
strawberries: 3,
@@ -25,8 +14,20 @@ pepper: 2,
celery: 1.69
}
- list = DivvyUp::List.new(items)
- expect(list.split(1)).to eql([items])
+ }
+
+ it "exists" do
+ expect(DivvyUp::List)
+ end
+
+ it "creates a new list" do
+ list = DivvyUp::List.new({juice: 3, apple: 1.20, chicken: 7.99})
+ expect(list.items).to eql({juice: 3, apple: 1.20, chicken: 7.99})
+ end
+
+ it "splits a list into one group" do
+ list = DivvyUp::List.new(shopping_list)
+ expect(list.split(1)).to eql([shopping_list])
end
end
end
| Move parameters into let block
|
diff --git a/spec/app/content_schema_spec.rb b/spec/app/content_schema_spec.rb
index abc1234..def5678 100644
--- a/spec/app/content_schema_spec.rb
+++ b/spec/app/content_schema_spec.rb
@@ -0,0 +1,53 @@+require "spec_helper"
+
+RSpec.describe ContentSchema do
+ describe '#frontend_schema' do
+ it "it can link to GitHub" do
+ schema = ContentSchema.new("generic").frontend_schema
+
+ expect(schema.link_to_github).to eql('https://github.com/alphagov/govuk-content-schemas/blob/master/dist/formats/generic/frontend/schema.json')
+ end
+
+ it "it has a random example" do
+ schema = ContentSchema.new("generic").frontend_schema
+
+ expect(schema.random_example['content_id']).not_to be_nil
+ end
+
+ it "it has properties with inlined definitions" do
+ schema = ContentSchema.new("generic").frontend_schema
+
+ expect(schema.properties['base_path']["$ref"]).to eql(nil)
+ expect(schema.properties['base_path']["type"]).to eql("string")
+ end
+ end
+
+ describe '#publisher_content_schema' do
+ it "it can link to GitHub" do
+ schema = ContentSchema.new("generic").publisher_content_schema
+
+ expect(schema.link_to_github).to eql('https://github.com/alphagov/govuk-content-schemas/blob/master/dist/formats/generic/publisher/schema.json')
+ end
+
+ it "it has a random example" do
+ schema = ContentSchema.new("generic").publisher_content_schema
+
+ expect(schema.random_example['base_path']).not_to be_nil
+ end
+
+ it "it has properties with inlined definitions" do
+ schema = ContentSchema.new("generic").publisher_content_schema
+
+ expect(schema.properties['base_path']["$ref"]).to eql(nil)
+ expect(schema.properties['base_path']["type"]).to eql("string")
+ end
+ end
+
+ describe '#publisher_links_schema' do
+ it "it can link to GitHub" do
+ schema = ContentSchema.new("generic").publisher_links_schema
+
+ expect(schema.link_to_github).to eql('https://github.com/alphagov/govuk-content-schemas/blob/master/dist/formats/generic/publisher/links.json')
+ end
+ end
+end
| Add tests for `ContentSchema` class
|
diff --git a/spec/factories/plans_factory.rb b/spec/factories/plans_factory.rb
index abc1234..def5678 100644
--- a/spec/factories/plans_factory.rb
+++ b/spec/factories/plans_factory.rb
@@ -1,6 +1,7 @@ FactoryGirl.define do
factory :plan, class: TaskManager::Plan do
name 'A test plan'
+ plan_type :daily
data {{ x: ['A', 'B', 'C'], y: [1, 2, 3] }}
last_task_created_at 1.day.ago
autocompletable false
| Set default type of plan
|
diff --git a/spec/support/confirm_helpers.rb b/spec/support/confirm_helpers.rb
index abc1234..def5678 100644
--- a/spec/support/confirm_helpers.rb
+++ b/spec/support/confirm_helpers.rb
@@ -8,6 +8,7 @@ begin
example.run
ensure
+ Spree.send(:remove_const, :User)
Spree.const_set('User', old_user)
end
else
| Fix "already initialized constant" warnings about Spree::User
|
diff --git a/spec/support/shared_examples.rb b/spec/support/shared_examples.rb
index abc1234..def5678 100644
--- a/spec/support/shared_examples.rb
+++ b/spec/support/shared_examples.rb
@@ -1,3 +1,4 @@+# encoding: utf-8
# `cop` and `source` must be declared with #let.
| Add missing utf-8 encoding comment
|
diff --git a/spec/support/shared_examples.rb b/spec/support/shared_examples.rb
index abc1234..def5678 100644
--- a/spec/support/shared_examples.rb
+++ b/spec/support/shared_examples.rb
@@ -46,10 +46,10 @@ end
it 'return the count' do
- responses.first.body.result.should eq(2757)
+ responses.first.body.result.should be > 2757
end
it 'returns the unique count' do
- responses.last.body.result.should eq(9)
+ responses.last.body.result.should be > 9
end
end | Fix specs that relied on exact values
|
diff --git a/spec/install/force_spec.rb b/spec/install/force_spec.rb
index abc1234..def5678 100644
--- a/spec/install/force_spec.rb
+++ b/spec/install/force_spec.rb
@@ -13,7 +13,7 @@
it "re-installs installed gems" do
bundle "install --force"
- expect(out).to match /Installing rack 1\.0\.0/
+ expect(out).to include "Installing rack 1.0.0"
should_be_installed "rack 1.0.0"
end
end
| Use include expectation instead of unneeded regular expression
Fixes lint warning
|
diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb
index abc1234..def5678 100644
--- a/spec/models/course_spec.rb
+++ b/spec/models/course_spec.rb
@@ -0,0 +1,47 @@+require 'rails_helper'
+
+describe Course do
+ let(:user) { build(:user) }
+
+ describe '.courses_for_person' do
+ before(:each) do
+ allow(described_class).to receive(:collection_for_person)
+ end
+
+ it 'calls .collection_for_person' do
+ expect(described_class).to receive(:collection_for_person).with(1)
+ described_class.courses_for_person(1)
+ end
+ end
+
+ describe '._collection_for_person' do
+ let(:relation) { double('relation') }
+
+ before(:each) do
+ allow(described_class)
+ .to receive(:teacher_id_or_student_id_matches)
+ .and_return(:foo)
+ allow(described_class).to receive(:joins).and_return(relation)
+ allow(relation).to receive(:where).and_return(relation)
+ allow(relation).to receive(:distinct)
+ end
+ after(:each) do
+ described_class.send(:_collection_for_person, 1)
+ end
+
+ it 'calls .teacher_id_or_student_id_matches' do
+ expect(described_class)
+ .to receive(:teacher_id_or_student_id_matches)
+ .with(1)
+ end
+ it 'calls .joins' do
+ expect(described_class).to receive(:joins).with(:enrollments)
+ end
+ it 'calls .where' do
+ expect(relation).to receive(:where).with(:foo)
+ end
+ it 'calls .distinct' do
+ expect(relation).to receive(:distinct)
+ end
+ end
+end
| Add tests for Course class methods
|
diff --git a/app/models/payload.rb b/app/models/payload.rb
index abc1234..def5678 100644
--- a/app/models/payload.rb
+++ b/app/models/payload.rb
@@ -26,7 +26,7 @@ end
def source_branch
- merge_request["source_branch"]
+ merge_request["last_commit"]["id"]
end
def target_branch
| Fix bug when branch name contains slash.
|
diff --git a/bosh-director/db/migrations/director/20150513225143_ip_addresses.rb b/bosh-director/db/migrations/director/20150513225143_ip_addresses.rb
index abc1234..def5678 100644
--- a/bosh-director/db/migrations/director/20150513225143_ip_addresses.rb
+++ b/bosh-director/db/migrations/director/20150513225143_ip_addresses.rb
@@ -3,7 +3,7 @@ create_table :ip_addresses do
primary_key :id
String :network_name
- Integer :address
+ Bignum :address
TrueClass :allocated, default: false
String :type # 'static', 'dynamic', 'reserved'
| Use bignum for ip address
Postgres Integer is too small
Signed-off-by: Maria Shaldibina <dc03896a0185453e5852a5e0f0fab6cbd2e026ff@pivotal.io>
|
diff --git a/spec/models/staff_member_spec.rb b/spec/models/staff_member_spec.rb
index abc1234..def5678 100644
--- a/spec/models/staff_member_spec.rb
+++ b/spec/models/staff_member_spec.rb
@@ -8,5 +8,11 @@ expect(member.hashed_password).to be_kind_of(String)
expect(member.hashed_password.size).to eq(60)
end
+
+ example 'nil を与えると、 hashed_password は nil になる' do
+ member = StaffMember.new(hashed_password: 'x')
+ member.password = nil
+ expect(member.hashed_password).to be_nil
+ end
end
end
| Add spec. password = nil is hashed_password = nil
|
diff --git a/spec/fixtures/developer.rb b/spec/fixtures/developer.rb
index abc1234..def5678 100644
--- a/spec/fixtures/developer.rb
+++ b/spec/fixtures/developer.rb
@@ -2,7 +2,8 @@ has_and_belongs_to_many :projects, :order => 'projects.name', :join_table => 'developers_projects'
def self.with_poor_ones(&block)
- with_scope :find => { :conditions => ['salary <= ?', 80000], :order => 'salary' } do
+ options = { :conditions => ['salary <= ?', 80000], :order => 'salary' }
+ with_scope({ :find => options }, :overwrite) do
yield
end
end
| Fix `with_scope` test for Rails 4.1
|
diff --git a/spec/hotel_matcher_spec.rb b/spec/hotel_matcher_spec.rb
index abc1234..def5678 100644
--- a/spec/hotel_matcher_spec.rb
+++ b/spec/hotel_matcher_spec.rb
@@ -15,5 +15,12 @@ expect(all_stdout).to be == "Hotel matcher will search for a given hotel name and print its url\nUsage: hotel_matcher hotel-name e.g hotel_matcher \"DoubleTree Hilton Amsterdam\"\n"
end
end
+
+ context "when no hotel is found" do
+ it "should display a 'no result mesage'" do
+ run "hotel_matcher kakaroto"
+ expect(all_stdout).to include "No results for word kakaroto"
+ end
+ end
end
end
| Add test to check 'no result message' is displayed
|
diff --git a/spec/unit/rack_app_spec.rb b/spec/unit/rack_app_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/rack_app_spec.rb
+++ b/spec/unit/rack_app_spec.rb
@@ -24,7 +24,9 @@
describe "with a valid payload" do
before do
- post '/build', repo: 'emberjs/ember.js', pull_request_number: '3516'
+ post '/build', repo: 'emberjs/ember.js',
+ pull_request_number: '3516',
+ perform_cross_browser_tests: 'true'
assert last_response.ok?
end
@@ -35,7 +37,7 @@ end
it "should provide the correct arguments to the queued worker" do
- expected = ["emberjs/ember.js", "3516"]
+ expected = ["emberjs/ember.js", "3516", 'true']
job = AssetBuildingWorker.jobs.first
| Fix params for RackApp /build.
|
diff --git a/coach_assist.gemspec b/coach_assist.gemspec
index abc1234..def5678 100644
--- a/coach_assist.gemspec
+++ b/coach_assist.gemspec
@@ -21,9 +21,9 @@
spec.add_development_dependency "bundler", "~> 1.10"
spec.add_development_dependency "rake", "~> 10.0"
- spec.add_development_dependency "rspec"
+ spec.add_development_dependency "rspec", "~> 3.3"
- spec.add_dependency 'httparty'
- spec.add_dependency 'hashie'
- spec.add_dependency 'activesupport'
+ spec.add_dependency 'httparty', '~> 0.13.7'
+ spec.add_dependency 'hashie', '~> 3.4.2'
+ spec.add_dependency 'activesupport', '~> 4.2'
end
| Add version numbers to dependencies so rubygems wont complain any longer
|
diff --git a/attributes/default.rb b/attributes/default.rb
index abc1234..def5678 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -16,5 +16,3 @@ default['racktables']['db']['user'] = "racktables_user"
default['racktables']['db']['host'] = "localhost"
default['racktables']['db']['password'] = "password"
-
-default['racktables']['admin']['password'] = "password123"
| Remove 'admin' attribute. No longer used.
|
diff --git a/Casks/jumpshare.rb b/Casks/jumpshare.rb
index abc1234..def5678 100644
--- a/Casks/jumpshare.rb
+++ b/Casks/jumpshare.rb
@@ -1,8 +1,8 @@ cask :v1 => 'jumpshare' do
- version '2.1.1'
- sha256 '8181e5b35bd02dda770f81ba8f39b83e3c1cde0b934e2e563d962ce4ea16fced'
+ version '2.1.2'
+ sha256 '4745d9aa6902c902dd81eefdb1977b59da6687ce4040b0f3840f9c47ae0a3d48'
- url "https://jumpshare.com/apps/mac/Jumpshare-#{version}.zip"
+ url "https://apps.jumpshare.com/desktop/mac/Jumpshare-#{version}.zip"
name 'Jumpshare'
homepage 'https://jumpshare.com/'
license :gratis
| Update Jumpshare to version 2.1.2
|
diff --git a/Formula/soprano.rb b/Formula/soprano.rb
index abc1234..def5678 100644
--- a/Formula/soprano.rb
+++ b/Formula/soprano.rb
@@ -5,6 +5,7 @@ @homepage='http://soprano.sourceforge.net/'
@md5='c9a2c008b80cd5d76599e9d48139dfe9'
+ depends_on 'cmake'
depends_on 'qt'
depends_on 'clucene'
depends_on 'redland'
| Add cmake as a build dependency for Soprano
|
diff --git a/tty-which.gemspec b/tty-which.gemspec
index abc1234..def5678 100644
--- a/tty-which.gemspec
+++ b/tty-which.gemspec
@@ -6,7 +6,7 @@ spec.name = "tty-which"
spec.version = TTY::Which::VERSION
spec.authors = ["Piotr Murach"]
- spec.email = [""]
+ spec.email = ["me@piotrmurach.com"]
spec.summary = %q{Platform independent implementation of Unix which command.}
spec.description = %q{Platform independent implementation of Unix which command.}
spec.homepage = "http://piotrmurach.github.io/tty/"
@@ -21,7 +21,7 @@
spec.required_ruby_version = '>= 2.0.0'
- spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
+ spec.add_development_dependency 'bundler', '>= 1.5.0'
spec.add_development_dependency 'rspec', '~> 3.1'
spec.add_development_dependency 'rake'
end
| Change to relax bundler version
|
diff --git a/test/test_apns-s3.rb b/test/test_apns-s3.rb
index abc1234..def5678 100644
--- a/test/test_apns-s3.rb
+++ b/test/test_apns-s3.rb
@@ -8,21 +8,29 @@ end
test "pemfile exists" do
- stub(ApnsS3).pemfile_exist?(@pem_filename) { true }
+ # FakeFS do
+ # FileUtils.touch @pem_filename
+ # mock(APNS).pem=(@pem_filename)
+ # ApnsS3.set_pemfile filename: @pem_filename
+ # end
+ #
+ # # NOTE: this code makes a warning below:
+ # # .../vendor/bundle/ruby/2.4.0/gems/fakefs-0.10.2/lib/fakefs/base.rb:21:warning: instance variable @activated not initialized
+
+ FakeFS.activate!
+ FileUtils.touch @pem_filename
mock(APNS).pem=(@pem_filename)
ApnsS3.set_pemfile filename: @pem_filename
+ FakeFS.deactivate!
end
test "pemfile DOES NOT exist" do
- stub(ApnsS3).pemfile_exist?(@pem_filename) { false }
- credentials_stub = Object.new
- stub(Aws::Credentials).new { credentials_stub }
- region = 'dummy-region-name'
- stub(Aws.config).update(region: region, credentials: credentials_stub)
+ assert !File.exist?(@pem_filename)
+
client_stub = Object.new
stub(Aws::S3::Client).new { client_stub }
stub(client_stub).get_object
mock(APNS).pem=(@pem_filename)
- ApnsS3.set_pemfile region: region, filename: @pem_filename
+ ApnsS3.set_pemfile region: 'fake-region', filename: @pem_filename
end
end
| Fix the test with fakefs
|
diff --git a/Library/Homebrew/extend/os/linux/development_tools.rb b/Library/Homebrew/extend/os/linux/development_tools.rb
index abc1234..def5678 100644
--- a/Library/Homebrew/extend/os/linux/development_tools.rb
+++ b/Library/Homebrew/extend/os/linux/development_tools.rb
@@ -21,13 +21,7 @@ end
def build_system_info
- brewed_glibc_version = begin
- Formula["glibc"].any_installed_version
- rescue FormulaUnavailableError
- nil
- end
- glibc_version = brewed_glibc_version || OS::Linux::Glibc.system_version
- generic_build_system_info.merge "glibc_version" => glibc_version
+ generic_build_system_info.merge "glibc_version" => OS::Linux::Glibc.system_version
end
end
end
| build_system_info: Use the host glibc version only
Use the host glibc version only to avoid errors with
brew tests --no-compat
|
diff --git a/canvas_spaces.gemspec b/canvas_spaces.gemspec
index abc1234..def5678 100644
--- a/canvas_spaces.gemspec
+++ b/canvas_spaces.gemspec
@@ -15,7 +15,7 @@ s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["test/**/*"]
- s.add_dependency "rails", ">= 3.2", "< 5.1"
+ s.add_dependency "rails", ">= 3.2", "< 5.2"
s.add_development_dependency "sqlite3"
end
| Update gemspec to allow Rails 5.1
|
diff --git a/app/controllers/tips_controller.rb b/app/controllers/tips_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/tips_controller.rb
+++ b/app/controllers/tips_controller.rb
@@ -34,6 +34,14 @@ end
def update
+ @tip = Tip.find(params[:id])
+ attributes = params.require(:tip).permit(:title, :body, :tags, :category, :language, :author)
+ @tip.assign_attributes(attributes)
+ if @tip.save
+ redirect_to @tip, notice: "Updated tip"
+ else
+ render "new"
+ end
end
def destroy
| Implement update method for tips controller
|
diff --git a/app/controllers/urls_controller.rb b/app/controllers/urls_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/urls_controller.rb
+++ b/app/controllers/urls_controller.rb
@@ -36,7 +36,7 @@ def destroy
@url = Url.find(params[:id])
@url.destroy
- redirect_to urls_url
+ redirect_to urls_url, notice: 'Url was successfully destroyed.'
end
private
| Add notice to redirect when destroying Urls
The create and edit action redirects have notices, so it seems
reasonable that the destroy action would have a similar notice. This
should make the app more usable.
Change-Id: Ie3c98a2952201c45858d2a8ef706be32c98ec9b0
|
diff --git a/gir_ffi-pretty_printer.gemspec b/gir_ffi-pretty_printer.gemspec
index abc1234..def5678 100644
--- a/gir_ffi-pretty_printer.gemspec
+++ b/gir_ffi-pretty_printer.gemspec
@@ -11,7 +11,7 @@ s.email = ['matijs@matijs.net']
s.homepage = 'http://www.github.com/mvz/gir_ffi-pretty_printer'
- s.license = 'LGPL-2.1'
+ s.license = 'LGPL-2.1+'
s.files = Dir['{lib,test}/**/*.rb', 'README.md', 'Rakefile']
s.test_files = Dir['test/**/*.rb']
| Correct license info in gemspec
|
diff --git a/app/controllers/auth_controller.rb b/app/controllers/auth_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/auth_controller.rb
+++ b/app/controllers/auth_controller.rb
@@ -29,6 +29,8 @@ end
def team_access?
+ return true if ENV['GITHUB_TEAM_ID'].nil?
+
host = "https://api.github.com"
path = "/teams/#{ENV['GITHUB_TEAM_ID']}/members"
params = "access_token=#{auth_hash.credentials['token']}"
| Update to make GITHUB_TEAM_ID optional properly
|
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -1,6 +1,6 @@ class RootController < ApplicationController
- caches_page :campaign, :wrapper, :print, :related, :report_a_problem, :homepage, :admin, :beta_notice
+ caches_page :campaign, :wrapper, :print, :related, :report_a_problem, :homepage, :admin, :beta_notice, :header_footer_only, :chromeless
caches_page *%w(404 406 418 500 501 503 504)
def related
| Add cache to header_footer_only and chromeless
|
diff --git a/app/decorators/switch_decorator.rb b/app/decorators/switch_decorator.rb
index abc1234..def5678 100644
--- a/app/decorators/switch_decorator.rb
+++ b/app/decorators/switch_decorator.rb
@@ -2,4 +2,10 @@ def self.fonticon
'ff ff-network-switch'
end
+
+ def single_quad
+ {
+ :fonticon => fonticon
+ }
+ end
end
| Add single_quad definition into the SwitchDecorator
https://bugzilla.redhat.com/show_bug.cgi?id=1546729
|
diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/rss_controller.rb
+++ b/app/controllers/rss_controller.rb
@@ -5,7 +5,7 @@
def feed
ads = Ad
- ads = params[:type] == 'want' ? ads.want.available : ads.give
+ ads = params[:type] == 'want' ? ads.want : ads.give.available
ads = ads.by_woeid_code(params[:woeid])
@ads = policy_scope(ads).limit(30)
| Fix scope being incorrectly applied in RSS feed
|
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index abc1234..def5678 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,15 +2,15 @@ # Likewise, all the methods added will be available for all controllers.
class ApplicationController < ActionController::Base
- def render(args)
- if args[:json]
+ def render(args = {})
+ if ! args[:json].nil?
@headers['Content-Type'] = 'text/javascript'
obj = args.delete(:json)
args[:text] = obj.to_json
super(args)
else
- super(*args)
+ super(args)
end
end
| Fix render override to have a default {} argument
|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,31 @@ # Methods added to this helper will be available to all templates in the application.
module ApplicationHelper
+ def display_success
+ if !flash[:success] || flash[:success].empty?
+ return ''
+ end
+
+ ret = '<ul id="success">'
+ flash[:success].each do |s|
+ ret = ret + '<li>' + s + '</li>'
+ end
+
+ ret = ret + '</ul>'
+ return ret
+ end
+
+ def display_errors
+ if !flash[:errors] || flash[:errors].empty?
+ return ''
+ end
+
+ ret = '<ul id="errors">'
+ flash[:errors].each_full do |e|
+ ret = ret + '<li>' + e + '</li>'
+ end
+
+ ret = ret + '</ul>'
+
+ return ret
+ end
end
| Add error/success helper functions mainly for non-ajax form submission
|
diff --git a/app/representations/api/poi_log.rb b/app/representations/api/poi_log.rb
index abc1234..def5678 100644
--- a/app/representations/api/poi_log.rb
+++ b/app/representations/api/poi_log.rb
@@ -2,18 +2,11 @@ extend ActiveSupport::Concern
included do
- def around_api_response(api_template)
- custom_cache_key = "api_response_#{I18n.locale}_#{self.cache_key}_#{api_template.to_s}"
- Rails.cache.fetch(custom_cache_key, :expires_in => 1.hour) do
- yield
- end
- end
-
- # API template for '/nodes/changes'
+ # API template for '/nodes/changes'
api_accessible :changes_stream do |t|
t.add :osm_id
t.add :action
t.add lambda { |poi| poi.created_at }, :as => :timestamp
end
- end
+ end
end
| Remove caching in node changes template
|
diff --git a/app/helpers/form_answer_helper.rb b/app/helpers/form_answer_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/form_answer_helper.rb
+++ b/app/helpers/form_answer_helper.rb
@@ -38,7 +38,7 @@
def average_growth_for(form_answer, year)
growth = form_answer.average_growth_for(year)
- growth || content_tag(:span, "-", class: "centered")
+ growth || "-"
end
def sic_code(form_answer)
| Fix admin financial summary sector avg growth text alignment
|
diff --git a/spec/features/user/profile_spec.rb b/spec/features/user/profile_spec.rb
index abc1234..def5678 100644
--- a/spec/features/user/profile_spec.rb
+++ b/spec/features/user/profile_spec.rb
@@ -10,18 +10,27 @@ visit edit_user_profile_path
end
- scenario 'I can change my name' do
- new_name = 'New Name'
- empty_name = ''
+ context 'As a registered user' do
+ scenario 'I can change my name' do
+ new_name = 'New Name'
+ empty_name = ''
- fill_in :user_name, with: empty_name
- click_button 'submit'
- expect(page).to have_selector('div.alert-danger')
+ fill_in :user_name, with: empty_name
+ click_button 'submit'
+ expect(page).to have_selector('div.alert-danger')
- fill_in :user_name, with: new_name
- click_button 'submit'
- expect(page).to have_selector('div', text: I18n.t('user.profiles.update.success'))
- expect(page).to have_field('user_name', with: new_name)
+ fill_in :user_name, with: new_name
+ click_button 'submit'
+ expect(page).to have_selector('div', text: I18n.t('user.profiles.update.success'))
+ expect(page).to have_field('user_name', with: new_name)
+ end
+
+ scenario 'I can link my account to facebook' do
+ facebook_link = find_link(nil, href: user_omniauth_authorize_path(:facebook))
+ expect { facebook_link.click }.to change { user.identities.count }.by(1)
+ expect(page).to have_selector('div',
+ text: I18n.t('user.omniauth_callbacks.facebook.success'))
+ end
end
end
end
| Add specs for link account with facebook
|
diff --git a/app/models/ckeditor/picture.rb b/app/models/ckeditor/picture.rb
index abc1234..def5678 100644
--- a/app/models/ckeditor/picture.rb
+++ b/app/models/ckeditor/picture.rb
@@ -5,10 +5,10 @@ validates :storage_data, file_content_type: { allow: /^image\/.*/ }, file_size: { less_than: 2.megabytes }
def url_content
- rails_representation_url(storage_data.variant(resize: "800>").processed, only_path: true)
+ rails_representation_url(storage_data.variant(resize: "800>"), only_path: true)
end
def url_thumb
- rails_representation_url(storage_data.variant(resize: "118x100").processed, only_path: true)
+ rails_representation_url(storage_data.variant(resize: "118x100"), only_path: true)
end
end
| Fix deleted file case in CKEditor
We were getting an error when browsing the server if one file had been
deleted.
|
diff --git a/spec/commands/ps_command_spec.rb b/spec/commands/ps_command_spec.rb
index abc1234..def5678 100644
--- a/spec/commands/ps_command_spec.rb
+++ b/spec/commands/ps_command_spec.rb
@@ -20,7 +20,8 @@
it 'it lists PID and command for each process in the manager' do
- expect(@double2).to receive(:id).once
+ allow_any_instance_of(Kernel).to receive(:puts).with('123 : pwd')
+ allow_any_instance_of(Kernel).to receive(:puts).with('124 : ls')
expect(@double1).to receive(:id).once
expect(@double1).to receive(:cmd).once
expect(@double2).to receive(:cmd).once
| Remove unnecessary STDOUT output in test case
|
diff --git a/spec/debian/install_chef_spec.rb b/spec/debian/install_chef_spec.rb
index abc1234..def5678 100644
--- a/spec/debian/install_chef_spec.rb
+++ b/spec/debian/install_chef_spec.rb
@@ -0,0 +1,7 @@+require 'spec_helper'
+
+# Make sure Chef installs
+
+describe command('curl -kL https://www.chef.io/chef/install.sh | bash') do
+ its(:exit_status) { should eq 0 }
+end
| Test to make sure Chef can install
|
diff --git a/app.rb b/app.rb
index abc1234..def5678 100644
--- a/app.rb
+++ b/app.rb
@@ -2,6 +2,10 @@ require 'slim'
require 'data_mapper'
require 'dm-postgres-adapter'
+
+configure :development do
+ require 'dm-sqlite-adapter'
+end
configure do
Slim::Engine.set_default_options :pretty => true
@@ -22,7 +26,6 @@ end
configure :development do
- require 'dm-sqlite-adapter'
DataMapper.auto_migrate!
end
| Move dm-sqlite-adapter require to its own configure development block
|
diff --git a/docs/jekyll-cayman-theme.gemspec b/docs/jekyll-cayman-theme.gemspec
index abc1234..def5678 100644
--- a/docs/jekyll-cayman-theme.gemspec
+++ b/docs/jekyll-cayman-theme.gemspec
@@ -13,6 +13,6 @@ spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(_layouts|_includes|_sass|LICENSE|README)/i}) }
spec.add_development_dependency "jekyll", "~> 3.2"
- spec.add_development_dependency "bundler", "~> 1.12"
+ spec.add_development_dependency "bundler", ">= 2.1.0"
spec.add_development_dependency "rake", "~> 12.3"
-end+end
| Update bundler requirement from ~> 1.12 to >= 2.1.0 in /docs (dependabot) |
diff --git a/emojidataios.podspec b/emojidataios.podspec
index abc1234..def5678 100644
--- a/emojidataios.podspec
+++ b/emojidataios.podspec
@@ -22,6 +22,7 @@ s.social_media_url = 'https://twitter.com/maxoumime'
s.ios.deployment_target = '8.0'
+ s.watchos.deployment_target = '5.0'
s.source_files = 'emojidataios/Classes/**/*'
| Add watchOS deployment target to the podspec
|
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index abc1234..def5678 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -0,0 +1,12 @@+RSpec.configure do |config|
+ config.before(:suite) do
+ DatabaseCleaner.clean
+ end
+
+ config.before(:each) do
+ DatabaseCleaner.start
+ end
+ config.after(:each) do
+ DatabaseCleaner.clean
+ end
+end
| Add database cleaner rspec support.
|
diff --git a/spec/support/poslavu_api_stub.rb b/spec/support/poslavu_api_stub.rb
index abc1234..def5678 100644
--- a/spec/support/poslavu_api_stub.rb
+++ b/spec/support/poslavu_api_stub.rb
@@ -34,8 +34,8 @@ if actual_filters = params['filters']
# request has parameter
# parse both
- expected = MultiJson.load(expected_filters)
- actual = MultiJson.load(actual_filters)
+ expected = MultiJson.load(expected_filters).sort_by { |f| f['field'] }
+ actual = MultiJson.load(actual_filters).sort_by { |f| f['field'] }
# compare
expected == actual
| Sort filters by field since where() hashes do not have a fixed order
This is another change to accomodate 1.8's non-deterministic Hash
sorting, which did not come up until pushing the previous change.
|
diff --git a/base/lib/flow/actions/if_match.rb b/base/lib/flow/actions/if_match.rb
index abc1234..def5678 100644
--- a/base/lib/flow/actions/if_match.rb
+++ b/base/lib/flow/actions/if_match.rb
@@ -12,7 +12,8 @@ else
@block_children = @children
@children = []
- new_flow.union *endpoints(@block_children).map(&:flow)
+ subflows = endpoints(@block_children).map(&:flow)
+ new_flow.union(*subflows).copy_location(self)
end
else
new_flow
| Copy location for union of if/unless_match
|
diff --git a/lib/dolt/disk_repo_resolver.rb b/lib/dolt/disk_repo_resolver.rb
index abc1234..def5678 100644
--- a/lib/dolt/disk_repo_resolver.rb
+++ b/lib/dolt/disk_repo_resolver.rb
@@ -28,9 +28,9 @@ end
def all
- Dir.entries(root).select do |e|
+ (Dir.entries(root).select do |e|
File.exists?(File.join(root, e, ".git"))
- end
+ end).sort
end
private
| Sort the repo listing alfanumerically
|
diff --git a/event_store-entity_store.gemspec b/event_store-entity_store.gemspec
index abc1234..def5678 100644
--- a/event_store-entity_store.gemspec
+++ b/event_store-entity_store.gemspec
@@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = 'event_store-entity_store'
- s.version = '0.0.3.5'
+ s.version = '0.1.0.0'
s.summary = 'Store of entities that are projected from EventStore streams'
s.description = ' '
| Package version is increased from 0.0.3.5 to 0.1.0.0
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.