ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-26 04:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #74 from ENSL/develop

Browse source 
Develop
This commit is contained in:
simplefl 2015-11-09 09:50:27 +01:00
commit e2670c7c9f
35 changed files with 328 additions and 308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/assets/stylesheets/themes/default/pages/_matches.scss Normal file → Executable file
View file

@ -156,6 +156,7 @@ div#match {
.team-1,
.team-2 {
position: relative;
margin-bottom: 20px;
.player {
@include span-columns(12);
@ -167,21 +168,8 @@ div#match {
position: relative;
}
.controls {
top: 0;
position: absolute;
z-index: 100;
input {
margin: 0;
}
}
form {
label.checkbox {
padding: 0;
}
label.checkbox {
padding: 0;
}
}
@ -193,16 +181,9 @@ div#match {
margin: 0 0 0 10px;
}
.controls {
left: 0;
}
form {
label.checkbox {
float: right;
margin-left: 1em;
}
label.checkbox {
float: right;
margin-left: 1em;
}
}
@ -210,16 +191,9 @@ div#match {
@include span-columns(6);
@include omega;
.controls {
right: 0;
}
form {
label.checkbox {
float: left;
margin-right: 1em;
}
label.checkbox {
float: left;
margin-right: 1em;
}
}
@ -234,6 +208,10 @@ div#match {
margin: 0;
}
}
form .controls {
clear: both;
}
}
.scoring {

48
app/assets/stylesheets/themes/flat/pages/_matches.scss Normal file → Executable file
View file

@ -155,6 +155,7 @@ div#match {
.team-1,
.team-2 {
position: relative;
margin-bottom: 20px;
.player {
@include span-columns(12);
@ -166,21 +167,8 @@ div#match {
position: relative;
}
.controls {
top: 0;
position: absolute;
z-index: 100;
input {
margin: 0;
}
}
form {
label.checkbox {
padding: 0;
}
label.checkbox {
padding: 0;
}
}
@ -192,16 +180,9 @@ div#match {
margin: 0 0 0 10px;
}
.controls {
left: 0;
}
form {
label.checkbox {
float: right;
margin-left: 1em;
}
label.checkbox {
float: right;
margin-left: 1em;
}
}
@ -209,16 +190,9 @@ div#match {
@include span-columns(6);
@include omega;
.controls {
right: 0;
}
form {
label.checkbox {
float: left;
margin-right: 1em;
}
label.checkbox {
float: left;
margin-right: 1em;
}
}
@ -233,6 +207,10 @@ div#match {
margin: 0;
}
}
form .controls {
clear: both;
}
}
.scoring {

28
app/controllers/matches_controller.rb
View file

@ -6,7 +6,7 @@ class MatchesController < ApplicationController
end
def show
@ownpred = @match.predictions.first conditions: {user_id: cuser.id} if cuser
@ownpred = @match.predictions.first conditions: { user_id: cuser.id } if cuser
@newpred = @match.predictions.build
end
@ -17,8 +17,9 @@ class MatchesController < ApplicationController
end
def admin
@matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee).all.group_by {|t| t.week.to_s }.to_a.reverse
render :layout => "full"
@matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee)
.all.group_by { |t| t.week.to_s }.to_a.reverse
render layout: "full"
end
def extra
@ -39,7 +40,7 @@ class MatchesController < ApplicationController
if @match.save
flash[:notice] = t(:matches_create)
redirect_to controller: 'contests', action: 'edit', id: @match.contest
redirect_to edit_contest_path(@match.contest)
else
render :new
end
@ -49,11 +50,11 @@ class MatchesController < ApplicationController
raise AccessError unless @match.can_update? cuser, params[:match]
if params[:match][:matchers_attributes]
params[:match][:matchers_attributes].each do |key, matcher|
matcher['_destroy'] = matcher['_destroy'] == "keep" ? false : true
if matcher['user_id'] == ""
matcher["_destroy"] = matcher["_destroy"] == "keep" ? false : true
if matcher["user_id"] == ""
params[:match][:matchers_attributes].delete key
elsif matcher['user_id'].to_i == 0
matcher['user_id'] = User.find_by_username(matcher['user_id']).id
elsif matcher["user_id"].to_i == 0
matcher["user_id"] = User.find_by_username(matcher["user_id"]).id
end
end
end
@ -71,7 +72,12 @@ class MatchesController < ApplicationController
end
end
else
render :edit
if URI(request.referer).path == match_ref_path(@match)
ref
render :ref
else
render :edit
end
end
end
@ -90,13 +96,13 @@ class MatchesController < ApplicationController
@match.hltv_stop
flash[:notice] = t(:hltv_stopped)
end
redirect_to action: 'show'
redirect_to action: "show"
end
def destroy
raise AccessError unless @match.can_destroy? cuser
@match.destroy
redirect_to controller: 'contests', action: 'edit', id: @match.contest
redirect_to edit_contest_path(@match.contest)
end
private

2
app/models/match.rb
View file

@ -193,7 +193,7 @@ class Match < ActiveRecord::Base
end
def send_notifications
Profile.all(include: :user, conditions: "notify_any_match = 1").find_each do |p|
Profile.includes(:user).where(notify_any_match: 1).find_each do |p|
Notifications.match p.user, self if p.user
end
contester2.team.teamers.active.each do |teamer|

6
app/views/matches/_lineup.html.erb Normal file → Executable file
View file

@ -1,7 +1,7 @@
<div class="players">
<% contester.lineup.each do |teamer| %>
<div class="player fields">
<% if matcher = @match.matchers.first(conditions: { user_id: teamer.user_id }) %>
<% if matcher = @match.matchers.first(conditions: { user_id: teamer.user_id, contester_id: contester.id }) %>
<%= hidden_field_tag "match[matchers_attributes][#{@n}][id]", matcher.id %>
<% end %>
@ -9,7 +9,7 @@
<%= hidden_field_tag "match[matchers_attributes][#{@n}][contester_id]", contester.id %>
<%= hidden_field_tag "match[matchers_attributes][#{@n}][match_id]", @match.id %>
<%= hidden_field_tag "match[matchers_attributes][#{@n}][merc]", false %>
<%= check_box_tag "match[matchers_attributes][#{@n}][_destroy]", "keep", @match.users.exists?(teamer.user), { id: "player_#{@n}" } %>
<%= check_box_tag "match[matchers_attributes][#{@n}][_destroy]", "keep", !matcher.nil?, { id: "player_#{@n}" } %>
<%= label_tag "player_#{@n}", '', class: 'checkbox' %>
@ -45,5 +45,7 @@
<%= hidden_field_tag "match[matchers_attributes][#{@n}][_destroy]", "keep" %>
<%= text_field_tag "match[matchers_attributes][#{@n}][user_id]", '', placeholder: 'Mercenary' %>
<% @n = @n + 1 %>
</div>
</div>

38
app/views/matches/ref.html.erb Normal file → Executable file
View file

@ -16,33 +16,25 @@
<div class="lineups">
<h3>Lineups</h3>
<div class="team-1">
<%= form_for @match do |f| %>
<%= f.error_messages %>
<div class="controls">
<%= f.submit 'Save Lineup' %>
</div>
<%= form_for @match do |f| %>
<%= f.error_messages %>
<div class="team-1">
<% [@match.contester1].each do |contester| %>
<%= render partial: "lineup", locals: { contester: contester } %>
<%= render partial: "lineup", locals: { contester: contester } %>
<% end %>
<% end %>
</div>
<div class="team-2">
<%= form_for @match do |f| %>
<%= f.error_messages %>
<div class="controls">
<%= f.submit 'Save Lineup' %>
</div>
</div>
<div class="team-2">
<% [@match.contester2].each do |contester| %>
<%= render partial: "lineup", locals: { contester: contester } %>
<%= render partial: "lineup", locals: { contester: contester } %>
<% end %>
<% end %>
</div>
</div>
<div class="controls">
<%= f.submit 'Save Lineups' %>
</div>
<% end %>
</div>
<div class="scoring">
@ -83,7 +75,7 @@
</div>
<div class="controls">
<%= f.submit 'Save Scores' %>
<%= f.submit 'Save Scoring' %>
</div>
<% end %>
</div>

4
app/views/matches/show.html.erb Normal file → Executable file
View file

@ -117,9 +117,9 @@
</div>
<% end %>
<% if cuser and @match.can_update? cuser, referee_id: cuser.id %>
<% if cuser and @match.can_update? cuser, [:report] %>
<div class="referee">
<%= link_to "Referee Admin", { controller: :matches, action: 'ref', id: @match }, class: 'button' %>
<%= link_to "Referee Admin", match_ref_path(@match), class: 'button' %>
</div>
<% end %>
</div>

109
config/routes.rb Normal file → Executable file
View file

@ -1,6 +1,6 @@
Ensl::Application.routes.draw do
Ensl::Application.routes.draw do
%w(403 404 422 500).each do |code|
get code, to: 'errors#show', code: code
get code, to: "errors#show", code: code
end
namespace :api do
@ -17,12 +17,12 @@ Ensl::Application.routes.draw do
resources :versions
end
match 'contests/del_map'
match 'contests/scores'
match 'contests/historical', to: "contests#historical"
match "contests/del_map"
match "contests/scores"
match "contests/historical", to: "contests#historical"
resources :contests do
get 'current', on: :collection
get "current", on: :collection
end
resources :log_events
@ -30,7 +30,7 @@ Ensl::Application.routes.draw do
resources :options
resources :polls
match 'comments/quote'
match "comments/quote"
resources :comments
resources :shoutmsgs
@ -43,8 +43,8 @@ Ensl::Application.routes.draw do
resources :forumers
resources :topics
match 'forums/up'
match 'forums/down'
match "forums/up"
match "forums/down"
resources :forums
resources :users
@ -55,9 +55,10 @@ Ensl::Application.routes.draw do
resources :servers
resources :predictions
resources :rounds
resources :matches do |m|
get "matches/ref/:id" => "matches#ref", as: :match_ref
resources :matches do
get :admin, to: "matches#admin", on: :collection
get :ref, to: "matches#ref"
end
resources :maps
@ -73,66 +74,66 @@ Ensl::Application.routes.draw do
resources :bans
resources :tweets
resources :issues
match 'posts/quote'
match "posts/quote"
resources :posts
resources :brackets
match 'about/action'
match 'about/staff'
match 'about/statistics'
match "about/action"
match "about/staff"
match "about/statistics"
match 'refresh', to: "application#refresh"
match 'search', to: "application#search"
match "refresh", to: "application#refresh"
match "search", to: "application#search"
match 'news', to: "articles#news_index"
match 'news/archive', to: "articles#news_archive"
match 'news/admin', to: "articles#admin"
match 'articles/cleanup'
match "news", to: "articles#news_index"
match "news/archive", to: "articles#news_archive"
match "news/admin", to: "articles#admin"
match "articles/cleanup"
match 'data_files/admin'
match 'data_files/addFile'
match 'data_files/delFile'
match 'data_files/trash'
match "data_files/admin"
match "data_files/addFile"
match "data_files/delFile"
match "data_files/trash"
match 'contesters/recalc'
match "contesters/recalc"
match 'directories', to: "directories#show", id: 1
match "directories", to: "directories#show", id: 1
match 'gathers/refresh'
match 'gathers/latest/:game', to: "gathers#latest", via: :get
match 'gather', to: "gathers#latest", game: "ns2", via: :get
match "gathers/refresh"
match "gathers/latest/:game", to: "gathers#latest", via: :get
match "gather", to: "gathers#latest", game: "ns2", via: :get
match 'gatherers/:id/status', to: "gatherers#status", via: :post
match "gatherers/:id/status", to: "gatherers#status", via: :post
match 'groups/addUser'
match 'groups/delUser'
match "groups/addUser"
match "groups/delUser"
match 'movies/download'
match 'movies/preview'
match 'movies/snapshot'
match "movies/download"
match "movies/preview"
match "movies/snapshot"
match 'plugin/user'
match "plugin/user"
match 'users/forgot'
match 'users/recover'
match 'users/agenda'
match 'users/logout'
match 'users/login'
match "users/forgot"
match "users/recover"
match "users/agenda"
match "users/logout"
match "users/login"
match 'users/agenda'
match 'users/login'
match 'users/logout'
match 'users/popup'
match 'users/forgot', to: "users#forgot"
match "users/agenda"
match "users/login"
match "users/logout"
match "users/popup"
match "users/forgot", to: "users#forgot"
match 'votes/create'
match "votes/create"
match ':controller/:action', requirements: { action: /A-Za-z/ }
match ':controller/:action/:id'
match ':controller/:action/:id.:format'
match ':controller/:action/:id/:id2'
match ":controller/:action", requirements: { action: /A-Za-z/ }
match ":controller/:action/:id"
match ":controller/:action/:id.:format"
match ":controller/:action/:id/:id2"
match 'teamers/replace', to: 'teamers#replace', as: 'teamers_replace'
match "teamers/replace", to: "teamers#replace", as: "teamers_replace"
end

13
config/styles/ruby.yml
View file

@ -13,6 +13,14 @@ Style/CollectionMethods:
find: detect
find_all: select
reduce: inject
Style/DotPosition:
Description: Checks the position of the dot in multi-line method calls.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
Enabled: true
EnforcedStyle: leading
SupportedStyles:
- leading
- trailing
Style/FileName:
Description: Use snake_case for source file names.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
@ -27,7 +35,7 @@ Style/IfUnlessModifier:
Description: Favor modifier if/unless usage when you have a single-line body.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
Enabled: false
MaxLineLength: 80
MaxLineLength: 100
Style/OptionHash:
Description: Don't use option hashes when you can use keyword arguments.
Enabled: false
@ -223,14 +231,11 @@ Lint/LiteralInCondition:
Lint/LiteralInInterpolation:
Description: Checks for literals used in interpolation.
Enabled: false
Metrics/LineLength:
Description: Limit lines to 100 characters.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
Enabled: true
Max: 100
AllowURI: true
URISchemes:
- http
- https

5
lib/verification.rb
View file

@ -54,8 +54,9 @@ module Verification
end
# TODO: rikki?
# Returns true if params (or its keys) are a subset of filter
# Returns true if params (or its keys if a hash) are a subset of filter
def self.contain(params, filter)
((params.instance_of?(Array) ? params : params.keys) - filter).empty?
keys = (params.instance_of?(Array) ? params : params.keys).map(&:to_sym)
(keys - filter).empty?
end
end

14
spec/controllers/api/v1/maps_controller_spec.rb Normal file → Executable file
View file

@ -1,19 +1,19 @@
require 'spec_helper'
require "spec_helper"
describe Api::V1::MapsController do
before do
request.accept = 'application/json'
request.accept = "application/json"
end
describe '#index' do
describe "#index" do
let!(:map) { create :map }
it 'returns a list of maps' do
it "returns a list of maps" do
get :index
expect(response).to be_success
expect(json['maps'].length).to eq(1)
json_map = json['maps'][0]
expect(json_map['id']).to eq(map.id)
expect(json["maps"].length).to eq(1)
json_map = json["maps"][0]
expect(json_map["id"]).to eq(map.id)
end
end
end

14
spec/controllers/api/v1/servers_controller_spec.rb Normal file → Executable file
View file

@ -1,20 +1,20 @@
require 'spec_helper'
require "spec_helper"
describe Api::V1::ServersController do
before do
request.accept = 'application/json'
request.accept = "application/json"
end
describe '#index' do
describe "#index" do
let!(:server) { create :server, :active }
let!(:inactive_server) { create :server, :inactive }
it 'returns a list of servers' do
it "returns a list of servers" do
get :index
expect(response).to be_success
expect(json['servers'].length).to eq(1)
json_server = json['servers'][0]
expect(json_server['id']).to eq(server.id)
expect(json["servers"].length).to eq(1)
json_server = json["servers"][0]
expect(json_server["id"]).to eq(server.id)
end
end
end

14
spec/controllers/plugin/plugin_controller_spec.rb Normal file → Executable file
View file

@ -1,9 +1,9 @@
require 'spec_helper'
require "spec_helper"
describe PluginController do
render_views
describe '#user' do
describe "#user" do
before do
create :group, :donors
create :group, :champions
@ -11,19 +11,19 @@ describe PluginController do
let!(:user) { create :user_with_team }
it 'returns user data' do
it "returns user data" do
get :user, id: user.steamid
expect(response).to be_success
expect(response.body).to include(user.username)
end
it 'definitely does not return IP address' do
last_ip = '127.0.0.1'
it "definitely does not return IP address" do
last_ip = "127.0.0.1"
user.lastip = last_ip
user.save!
get :user, id: user.steamid
expect(response).to be_success
expect(response).to_not include(last_ip)
expect(response).to_not include(last_ip)
end
end
end
end

4
spec/factories/article.rb Normal file → Executable file
View file

@ -1,6 +1,6 @@
FactoryGirl.define do
factory :article do
sequence(:title) { |n| "Article #{n}" }
sequence(:text) { |n| (0..100).map{ (0...8).map { (65 + rand(26)).chr }.join }.join(" ") }
sequence(:text) { (0..100).map { (0...8).map { (65 + rand(26)).chr }.join }.join(" ") }
end
end
end

6
spec/factories/ban.rb Normal file → Executable file
View file

@ -1,13 +1,13 @@
FactoryGirl.define do
factory :ban do
ban_type Ban::TYPE_SITE
expiry Date.today + 1
expiry Time.now.utc.to_date + 1
# Hack because of the awkward way bans are created (requires user_name)
before(:create) do |ban|
if ban.user.nil?
user = create :user
ban.user_name = user.username
else
else
ban.user_name = ban.user.username
end
end
@ -28,4 +28,4 @@ FactoryGirl.define do
trait :expired do
expiry Date.yesterday - 1
end
end
end

6
spec/factories/category.rb Normal file → Executable file
View file

@ -5,10 +5,10 @@ FactoryGirl.define do
end
trait :news do
domain Category::DOMAIN_NEWS
domain Category::DOMAIN_NEWS
end
trait :game do
domain Category::DOMAIN_GAMES
domain Category::DOMAIN_GAMES
end
end
end

10
spec/factories/contest.rb Executable file
View file

@ -0,0 +1,10 @@
FactoryGirl.define do
factory :contest do
sequence(:name) { |n| "Contest ##{n}" }
start Date.yesterday
self.end Date.tomorrow
status Contest::STATUS_PROGRESS
default_time "12:00:00"
end
end

8
spec/factories/contester.rb Executable file
View file

@ -0,0 +1,8 @@
FactoryGirl.define do
factory :contester do
contest
team do
create(:user_with_team).team
end
end
end

4
spec/factories/gather.rb Normal file → Executable file
View file

@ -4,10 +4,10 @@ FactoryGirl.define do
end
trait :running do
status Gather::STATE_RUNNING
status Gather::STATE_RUNNING
end
trait :picking do
status Gather::STATE_PICKING
status Gather::STATE_PICKING
end
end

26
spec/factories/group.rb Normal file → Executable file
View file

@ -1,27 +1,39 @@
FactoryGirl.define do
factory :group do
sequence(:id) { |n| n + 100 } # Preserve first 100
sequence(:id) { |n| n + 100 } # Preserve first 100
sequence(:name) { |n| "Group#{n}" }
association :founder, factory: :user
initialize_with { Group.find_or_create_by_id(id) }
end
trait :admin do
name "Admins"
id Group::ADMINS
name "Admins"
id Group::ADMINS
end
trait :caster do
name "Shoutcasters"
id Group::CASTERS
end
trait :champions do
name "Champions"
id Group::CHAMPIONS
name "Champions"
id Group::CHAMPIONS
end
trait :donors do
name "Donors"
id Group::DONORS
name "Donors"
id Group::DONORS
end
trait :gather_moderator do
name "Gather Moderator"
id Group::GATHER_MODERATORS
end
trait :ref do
name "Referees"
id Group::REFEREES
end
end

8
spec/factories/grouper.rb Normal file → Executable file
View file

@ -1,5 +1,5 @@
FactoryGirl.define do
factory :grouper do
sequence(:task) { |n| "Task#{n}" }
end
end
factory :grouper do
sequence(:task) { |n| "Task#{n}" }
end
end

14
spec/factories/issue.rb Normal file → Executable file
View file

@ -1,8 +1,8 @@
FactoryGirl.define do
factory :issue do
sequence(:title) { |n| "Issue title #{n}" }
sequence(:text) { |n| "Issue Text #{n}" }
status Issue::STATUS_OPEN
association :author, factory: :user
end
end
factory :issue do
sequence(:title) { |n| "Issue title #{n}" }
sequence(:text) { |n| "Issue Text #{n}" }
status Issue::STATUS_OPEN
association :author, factory: :user
end
end

13
spec/factories/match.rb Executable file
View file

@ -0,0 +1,13 @@
FactoryGirl.define do
factory :match do
contest
contester1 do
create(:contester, contest: contest)
end
contester2 do
create(:contester, contest: contest)
end
match_time 1.hour.from_now
end
end

16
spec/factories/message.rb Normal file → Executable file
View file

@ -1,9 +1,9 @@
FactoryGirl.define do
factory :message do
association :sender, factory: :user
association :recipient, factory: :user
sequence(:text) { |n| "text-#{n}" }
sequence(:title) { |n| "title-#{n}" }
sequence(:text_parsed) { |n| "text-#{n}" }
end
end
factory :message do
association :sender, factory: :user
association :recipient, factory: :user
sequence(:text) { |n| "text-#{n}" }
sequence(:title) { |n| "title-#{n}" }
sequence(:text_parsed) { |n| "text-#{n}" }
end
end

2
spec/factories/server.rb Normal file → Executable file
View file

@ -13,4 +13,4 @@ FactoryGirl.define do
active false
end
end
end
end

4
spec/factories/team.rb Normal file → Executable file
View file

@ -1,11 +1,11 @@
FactoryGirl.define do
factory :team do
sequence(:name) { |n| "Team ##{n}" }
irc "#team"
web "http://team.com"
tag "[TEAM]"
country "EU"
comment "We are a team"
end
end
end

14
spec/factories/user.rb Normal file → Executable file
View file

@ -20,6 +20,20 @@ FactoryGirl.define do
end
end
trait :caster do
after(:create) do |user|
group = create(:group, :caster)
create :grouper, user: user, group: group
end
end
trait :ref do
after(:create) do |user|
group = create(:group, :ref)
create :grouper, user: user, group: group
end
end
trait :chris do
steamid "0:1:58097444"
end

58
spec/features/shoutbox/shoutbox_spec.rb Normal file → Executable file
View file

@ -1,34 +1,34 @@
require 'spec_helper'
require "spec_helper"
feature 'Shoutbox', js: true do
let!(:user) { create :user }
feature "Shoutbox", js: true do
let!(:user) { create :user }
background do
sign_in_as user
end
background do
sign_in_as user
end
scenario 'creating a valid shout' do
visit root_path
shout = rand(100000).to_s
fill_in 'shoutbox_text', with: shout
click_button 'Shout!'
expect(page).to have_content(shout)
end
scenario "creating a valid shout" do
visit root_path
shout = rand(100_000).to_s
fill_in "shoutbox_text", with: shout
click_button "Shout!"
expect(page).to have_content(shout)
end
scenario 'enter more than 100 characters' do
valid_shout = 100.times.map { "a" }.join
invalid_shout = 101.times.map { "a" }.join
visit root_path
expect(page).to_not have_content("Maximum shout length exceeded")
fill_in 'shoutbox_text', with: invalid_shout
expect(page).to have_content("Maximum shout length exceeded")
fill_in 'shoutbox_text', with: valid_shout
expect(page).to_not have_content("Maximum shout length exceeded")
end
scenario "enter more than 100 characters" do
valid_shout = 100.times.map { "a" }.join
invalid_shout = 101.times.map { "a" }.join
visit root_path
expect(page).to_not have_content("Maximum shout length exceeded")
fill_in "shoutbox_text", with: invalid_shout
expect(page).to have_content("Maximum shout length exceeded")
fill_in "shoutbox_text", with: valid_shout
expect(page).to_not have_content("Maximum shout length exceeded")
end
scenario 'creating shout while banned' do
Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username
visit root_path
expect(find("#sidebar")).to have_content "You have been muted."
end
end
scenario "creating shout while banned" do
Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now.utc + 10.days, user_name: user.username
visit root_path
expect(find("#sidebar")).to have_content "You have been muted."
end
end

22
spec/features/users/case_insensitive_login_spec.rb Normal file → Executable file
View file

@ -1,6 +1,6 @@
require 'spec_helper'
require "spec_helper"
feature 'Case insensitive login', js: :true do
feature "Case insensitive login", js: :true do
let(:username) { "CaSe_InSeNsItIvE" }
let(:password) { "passwordABC123" }
let!(:user) { create(:user, username: username, raw_password: password) }
@ -9,23 +9,23 @@ feature 'Case insensitive login', js: :true do
visit root_path
end
feature 'when a user with mixed-case username signs in' do
scenario 'with a matching case allows the user to sign in' do
feature "when a user with mixed-case username signs in" do
scenario "with a matching case allows the user to sign in" do
fill_login_form(username)
click_button submit(:user, :login)
expect(page).to have_content(I18n.t('login_successful'))
expect(page).to have_content(I18n.t("login_successful"))
within user_status do
expect(page).to have_content(account_link)
end
end
scenario 'with a non-matching case allows the user to sign in' do
scenario "with a non-matching case allows the user to sign in" do
fill_login_form("CASE_INSENSITIVE")
click_button submit(:user, :login)
expect(page).to have_content(I18n.t('login_successful'))
expect(page).to have_content(I18n.t("login_successful"))
within user_status do
expect(page).to have_content(account_link)
@ -39,6 +39,6 @@ feature 'Case insensitive login', js: :true do
end
def account_link
'ACCOUNT'
"ACCOUNT"
end
end

2
spec/features/users/user_signs_up_spec.rb
View file

@ -12,7 +12,7 @@ feature "Visitor signs up", js: :true do
fill_form(:user, user.slice(*sign_up_attributes))
click_button submit(:user, :create)
end
expect(user_status).to have_content("ACCOUNT")
end

6
spec/models/user_spec.rb Normal file → Executable file
View file

@ -22,7 +22,7 @@
# salt :string(255)
#
require 'spec_helper'
require "spec_helper"
describe User do
let!(:user) { create :user }
@ -34,7 +34,7 @@ describe User do
it "returns true if user is banned" do
Ban.create!(ban_type: Ban::TYPE_SITE,
expiry: Time.now + 10.days,
expiry: Time.now.utc + 10.days,
user_name: user.username)
expect(user.banned?).to be_truthy
@ -42,7 +42,7 @@ describe User do
it "returns true for specific bans" do
Ban.create!(ban_type: Ban::TYPE_MUTE,
expiry: Time.now + 10.days,
expiry: Time.now.utc + 10.days,
user_name: user.username)
expect(user.banned? Ban::TYPE_MUTE).to be_truthy

2
spec/services/api/v1/users_collection_spec.rb Normal file → Executable file
View file

@ -28,4 +28,4 @@ describe Api::V1::UsersCollection do
end
end
end
end
end

2
spec/support/features/form_helpers.rb Normal file → Executable file
View file

@ -2,7 +2,7 @@ module Features
module FormHelpers
def fill_form(model, hash)
hash.each do |attribute, value|
fill_in attribute_translation(model, attribute), :with => value
fill_in attribute_translation(model, attribute), with: value
end
end

54
spec/support/features/server_helpers.rb Normal file → Executable file
View file

@ -1,24 +1,24 @@
module Features
module ServerHelpers
def test_server_creation_and_editing
dns = 'ServerDns.com'
ip = '192.168.1.1'
port = '8000'
password = 'secret'
name = 'MyNsServer'
description = 'My NS Server'
irc = '#some_channel'
dns = "ServerDns.com"
ip = "192.168.1.1"
port = "8000"
password = "secret"
name = "MyNsServer"
description = "My NS Server"
irc = "#some_channel"
visit new_server_path
fill_in 'Dns', with: dns
fill_in 'server_ip', with: ip
fill_in 'server_port', with: port
fill_in 'Password', with: password
fill_in 'Name', with: name
fill_in 'Description', with: description
fill_in 'Irc', with: irc
check 'Available for officials?'
click_button 'Save'
fill_in "Dns", with: dns
fill_in "server_ip", with: ip
fill_in "server_port", with: port
fill_in "Password", with: password
fill_in "Name", with: name
fill_in "Description", with: description
fill_in "Irc", with: irc
check "Available for officials?"
click_button "Save"
expect(page).to have_content(dns)
expect(page).to have_content("#{ip}:#{port}")
@ -26,17 +26,17 @@ module Features
expect(page).to have_content(irc)
expect(page).to have_content(description)
click_link 'Edit Server'
click_link "Edit Server"
fill_in 'Dns', with: "#{dns}2"
fill_in 'server_ip', with: "192.168.1.2"
fill_in 'server_port', with: "8001"
fill_in 'Password', with: "#{password}2"
fill_in 'Name', with: "#{name}2"
fill_in 'Description', with: "#{description}2"
fill_in 'Irc', with: "#{irc}2"
check 'Available for officials?'
click_button 'Save'
fill_in "Dns", with: "#{dns}2"
fill_in "server_ip", with: "192.168.1.2"
fill_in "server_port", with: "8001"
fill_in "Password", with: "#{password}2"
fill_in "Name", with: "#{name}2"
fill_in "Description", with: "#{description}2"
fill_in "Irc", with: "#{irc}2"
check "Available for officials?"
click_button "Save"
expect(page).to have_content("192.168.1.2:8001")
expect(page).to have_content("#{dns}2")
@ -45,4 +45,4 @@ module Features
expect(page).to have_content("#{description}2")
end
end
end
end

12
spec/support/features/session_helpers.rb Normal file → Executable file
View file

@ -1,21 +1,21 @@
module Features
module SessionHelpers
def sign_in_as(user)
def sign_in_as(user)
visit root_path
fill_in "login_username", with: user.username
fill_in "login_password", with: user.raw_password
click_button I18n.t('helpers.submit.user.login')
click_button I18n.t("helpers.submit.user.login")
end
def change_timezone_for(user, timezone)
visit edit_user_path(user.id)
click_link I18n.t('profile.locals')
click_link I18n.t("profile.locals")
find("option[value='#{timezone}']").select_option
click_button I18n.t('helpers.submit.user.update')
click_button I18n.t("helpers.submit.user.update")
end
def user_status
@ -26,4 +26,4 @@ module Features
find "#new_user"
end
end
end
end