Skip to content

Commit

Permalink
Improve and fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
isrba committed Aug 23, 2019
1 parent b612c95 commit ecf0dad
Show file tree
Hide file tree
Showing 26 changed files with 635 additions and 745 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ group :development, :test do
gem 'database_cleaner'
gem 'factory_bot_rails'
gem 'capybara', '~> 3.1'
gem 'selenium-webdriver'
gem 'capybara-selenium'
gem 'chromedriver-helper'
gem 'webdrivers'
gem 'guard-rspec'

# database
Expand Down
39 changes: 20 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ GEM
tzinfo (~> 1.1)
activesupport-json_encoder (1.1.0)
activesupport (>= 4.1.0, < 5.0)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (6.0.4)
attr_required (1.0.1)
awesome_nested_set (3.1.4)
Expand All @@ -121,13 +119,14 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
capybara (3.2.0)
capybara (3.28.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
regexp_parser (~> 1.5)
xpath (~> 3.2)
capybara-selenium (0.0.6)
capybara
selenium-webdriver
Expand All @@ -150,11 +149,8 @@ GEM
timers (>= 4.1.1)
celluloid-supervision (0.20.6)
timers (>= 4.1.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (1.2.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
childprocess (1.0.1)
rake (< 13.0)
chronic (0.10.2)
climate_control (0.2.0)
coderay (1.1.2)
Expand Down Expand Up @@ -223,7 +219,7 @@ GEM
multi_json
rack-oauth2 (>= 1.1)
url_safe_base64
ffi (1.9.25)
ffi (1.11.1)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
forgery (0.7.0)
Expand Down Expand Up @@ -266,7 +262,6 @@ GEM
ims-lti (1.2.2)
builder
oauth (>= 0.4.5, < 0.6)
io-like (0.3.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand Down Expand Up @@ -390,7 +385,7 @@ GEM
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.2)
public_suffix (3.1.1)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
rack (1.6.11)
Expand Down Expand Up @@ -443,6 +438,7 @@ GEM
redis-namespace (1.6.0)
redis (>= 3.0.4)
ref (2.0.0)
regexp_parser (1.6.0)
remotipart (1.4.2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
Expand Down Expand Up @@ -478,7 +474,7 @@ GEM
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
ruby_dep (1.5.0)
rubyzip (1.2.1)
rubyzip (1.2.3)
rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
sass (3.4.22)
Expand All @@ -492,9 +488,9 @@ GEM
rdoc (>= 5.0)
select2-rails (3.5.10)
thor (~> 0.14)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
Expand Down Expand Up @@ -554,9 +550,13 @@ GEM
activemodel (>= 4.2)
debug_inspector
railties (>= 4.2)
webdrivers (4.1.2)
nokogiri (~> 1.6)
rubyzip (~> 1.0)
selenium-webdriver (>= 3.0, < 4.0)
whenever (0.10.0)
chronic (>= 0.6.3)
xpath (3.1.0)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
Expand All @@ -578,7 +578,6 @@ DEPENDENCIES
capistrano-ext
capybara (~> 3.1)
capybara-selenium
chromedriver-helper
coffee-rails (~> 4.2.0)
d3_rails (~> 3.5.11)
data-anonymization (~> 0.6.5)
Expand Down Expand Up @@ -637,6 +636,7 @@ DEPENDENCIES
scout!
sdoc
select2-rails (~> 3.5.10)
selenium-webdriver
shared!
simplecov
squire (~> 1.3.6)
Expand All @@ -649,6 +649,7 @@ DEPENDENCIES
unicorn
university!
web-console
webdrivers
whenever

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion components/mooc/app/views/layouts/mooc/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<% if user_signed_in? %>
<%= render 'shared/shared/notifications', notifications: current_user.notifications.in_context(@context_id).unread.order(created_at: :desc).limit(5) %>
<li class="hidden-xs"><%= link_to current_user.nick, shared.user_path(current_user.nick) %></li>
<%= navbar_dropdown_tag :cog, nil, '#', class: :'hidden-xs' do %>
<%= navbar_dropdown_tag :cog, nil, '#', class: :'hidden-xs user-menu-dropdown' do %>
<li><%= link_to t('user.edit.profile'), shared.edit_user_registration_path(tab: :profile) %></li>
<li><%= link_to t('user.edit.notifications'), shared.edit_user_registration_path(tab: :notifications) %></li>
<li><%= link_to t('user.edit.social'), shared.edit_user_registration_path(tab: :social) %></li>
Expand Down
Loading

0 comments on commit ecf0dad

Please sign in to comment.