Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Contributing to TeSS

While TeSS was originally developed to serve as the training portal for [ELIXIR](https://www.elixir-europe.org/), it endeavours to be a generic training platform that can be easily customized and re-used in other communities.
While TeSS was originally developed to serve as the training portal for [ELIXIR](https://www.elixir-europe.org/), it endeavours to be a generic training platform that can be easily customized and reused in other communities.
To that end we welcome and encourage new contributors to get involved and help to shape and improve TeSS. This document discusses and explains different ways you can contribute to TeSS.
You can find a code checklist at the end of this document to summarize the important points.

Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ var EventsMap = {
var getTab = function () {
var tab = window.location.hash;
if (tab) {
return tab.substring(1) /* stip hash */
return tab.substring(1) /* strip hash */
} else {
return ''
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ ul.unstyled {
border: none;
}

/* The max width is dependant on the container (more info below) */
/* The max width is dependent on the container (more info below) */
.popover {
max-width: 500px !important; /* Max Width of the popover (depending on the container!) */
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def geocoding_cache_lookup
redis = Redis.new(url: TeSS::Config.redis_url)
if redis.exists?(location)
self.latitude, self.longitude = JSON.parse(redis.get(location))
Rails.logger.info("Re-using: #{location}")
Rails.logger.info("Reusing: #{location}")
end
rescue Redis::BaseError => e
raise e unless Rails.env.production?
Expand Down
2 changes: 1 addition & 1 deletion app/views/common/_topic_suggestions.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
</div>
<div class="col-md-10 latest_suggestion_description">
<%= sugestion.material.description %>
<%= suggestion.material.description %>
</div>
</div>
<div class="row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Variable that should be available
<div class="nav-block">
<p>
<%# Link to either external content provider's page or to the content provider's object in TeSS,
based on which controller/view is currenlty active %>
based on which controller/view is currently active %>
<%
if controller_name == 'content_providers'
url = content_provider.url
Expand Down
2 changes: 1 addition & 1 deletion app/workers/edit_suggestion_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class EditSuggestionWorker
include Sidekiq::Worker

# TODO: Should a random time delay go in here such that the chastisement of
# TODO: BioPortal is somewhat mimimised?
# TODO: BioPortal is somewhat minimised?
def perform(arg_array)
suggestible_id, suggestible_type = arg_array
logger.debug "ID: #{suggestible_id}"
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/friendly_id.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# MyModel.find('foo')
#
# This is significantly more convenient but may not be appropriate for
# all applications, so you must explicity opt-in to this behavior. You can
# all applications, so you must explicitly opt-in to this behavior. You can
# always also configure it on a per-model basis if you prefer.
#
# Something else to consider is that using the :finders addon boosts
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ en:
keywords: "Provide words or terms that clearly identify the learning path's topics."
licence: 'Select the licence for the learning path.'
objectives: >
Describe the knowledge, skills or abilities that students should acquire throught the completion or use of the
Describe the knowledge, skills or abilities that students should acquire through the completion or use of the
learning path.
other_types: 'Enter the types of resources that are not included on the above list.'
part_of: 'Describe the larger service of training to which this learning path belongs.'
Expand Down
2 changes: 1 addition & 1 deletion lib/ingestors/github_ingestor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def fetch_licence(licence)
end

# DOI – Fetches DOI from various sources in a repo
# I chose to only read the `README.md` as it seems to have the DOI badge almost everytime.
# I chose to only read the `README.md` as it seems to have the DOI badge almost every time.
# Whereas enabling the fetching of CITATION.cff or CITATION.md would result in increasing
# the number of api request.
def fetch_doi(full_name)
Expand Down
2 changes: 1 addition & 1 deletion lib/ingestors/material_csv_ingestor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def self.config

def read(url)
begin
# Google spreadsheet convertor
# Google spreadsheet converter
url = gsheet_to_csv(url)

# parse table
Expand Down
8 changes: 4 additions & 4 deletions public/api/definitions/tess.yml
Original file line number Diff line number Diff line change
Expand Up @@ -980,11 +980,11 @@ components:
latitude:
type: string
nullable: true
description: The latitude co-ordinate of the event.
description: The latitude coordinate of the event.
longitude:
type: string
nullable: true
description: The longitude co-ordinate of the event.
description: The longitude coordinate of the event.
created-at:
type: string
description: The date the event was first created on TeSS.
Expand Down Expand Up @@ -1240,7 +1240,7 @@ components:
licence:
type: string
nullable: true
description: The licence chosen to determine how the material may be re-used.
description: The licence chosen to determine how the material may be reused.
difficulty-level:
nullable: true
type: string
Expand Down Expand Up @@ -1556,7 +1556,7 @@ components:
type: string
licence:
type: string
description: The licence chosed to determine how the workflow may be re-used.
description: The licence chosen to determine how the workflow may be reused.
difficulty-level:
type: string
description: The difficulty level comprehension of the workflow requires.
Expand Down
2 changes: 1 addition & 1 deletion solr/conf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
(this will only apply if the field type is compressible; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
Expand Down
4 changes: 2 additions & 2 deletions test/controllers/subscriptions_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def initialize
assert_response :forbidden
end

test 'should delete a subscription via unsubcribe link' do
test 'should delete a subscription via unsubscribe link' do
sub = subscriptions(:daily_subscription)

assert_difference('Subscription.count', -1) do
Expand All @@ -121,7 +121,7 @@ def initialize
assert_response :success
end

test 'should not delete a subscription via unsubcribe link with invalid code' do
test 'should not delete a subscription via unsubscribe link with invalid code' do
sub = subscriptions(:daily_subscription)
sub2 = subscriptions(:weekly_subscription)

Expand Down
2 changes: 1 addition & 1 deletion test/models/event_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class EventTest < ActiveSupport::TestCase
test 'enqueues a geocoding worker after creating an event' do
assert_difference('GeocodingWorker.jobs.size', 1) do
parameters = @mandatory.merge({ user: users(:regular_user), title: 'New event', url: 'http://example.com',
online: false, description: 'event to test enqueing of geocoding worker',
online: false, description: 'event to test enqueuing of geocoding worker',
venue: 'A place', city: 'Manchester', country: 'UK', postcode: 'M16 0TH' })
event = Event.create(parameters)
assert event.errors[:url].empty?
Expand Down
2 changes: 1 addition & 1 deletion test/models/subscription_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class SubscriptionTest < ActiveSupport::TestCase
end

test '24-hour subscription is due slightly before 24 hours' do
# To prevent "mis-alignment" with daily cronjob.
# To prevent "misalignment" with daily cronjob.
sub = Subscription.new(frequency: :daily, user: users(:regular_user), query: 'test', subscribable_type: 'Material',
last_checked_at: 60.minutes.ago)
sub.save!
Expand Down
4 changes: 2 additions & 2 deletions test/unit/fairsharing/client_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ClientTest < ActiveSupport::TestCase
assert_equal @token, @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
end

test 'should re-use token from @redis' do
test 'should reuse token from @redis' do
set_cached_token('abcdefg', 1_669_997_273)

VCR.use_cassette('fairsharing/get_token') do
Expand All @@ -48,7 +48,7 @@ class ClientTest < ActiveSupport::TestCase
assert_equal 'abcdefg', @redis.hget(Fairsharing::Client::REDIS_KEY, 'token')
end

test 'should not re-use token from @redis if expired' do
test 'should not reuse token from @redis if expired' do
set_cached_token('abcdefg', 3.days.ago.to_i)

VCR.use_cassette('fairsharing/get_token') do
Expand Down