mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into upgrade/bootstrap

Browse Source
This commit is contained in:
Brenda Wallace
2019-05-11 07:58:57 +12:00
committed by GitHub
parent 8b6c3ef3fb 5bae18ed6e
commit 4d513aaabd
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile.lock
View File

@@ -84,7 +84,7 @@ GEM
uniform_notifier (~> 1.11)
byebug (11.0.1)
cancancan (3.0.1)
capybara (3.18.0)
capybara (3.19.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -99,8 +99,8 @@ GEM
capybara (>= 1.0, < 4)
launchy
chartkick (3.0.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
childprocess (1.0.1)
rake (< 13.0)
cliver (0.3.2)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
@@ -204,7 +204,7 @@ GEM
haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1)
railties (>= 5.1)
haml_lint (0.28.0)
haml_lint (0.30.0)
haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13)
@@ -306,7 +306,7 @@ GEM
multi_json (1.11.3)
multi_xml (0.6.0)
multipart-post (2.0.0)
newrelic_rpm (6.2.0.354)
newrelic_rpm (6.3.0.355)
nio4r (2.3.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
@@ -429,7 +429,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.68.0)
rubocop (0.68.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@@ -469,8 +469,8 @@ GEM
activemodel (>= 5)
elasticsearch (>= 6)
hashie
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
selenium-webdriver (3.142.0)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.12.0)
sidekiq (5.2.7)
@@ -507,7 +507,7 @@ GEM
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.5.0)
unicorn (5.5.0)
unicorn (5.5.1)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.12.1)

4
spec/features/percy/percy_spec.rb
View File

@@ -3,12 +3,12 @@ require 'rails_helper'
describe 'Test with visual testing', type: :feature, js: true do
let(:member) { FactoryBot.create :member, login_name: 'percy', preferred_avatar_uri: gravatar }
let(:member) { FactoryBot.create :member, login_name: 'percy', preferred_avatar_uri: gravatar }
let(:someone_else) { FactoryBot.create :member, login_name: 'ruby', preferred_avatar_uri: gravatar2 }
let(:gravatar) { 'http://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
let(:gravatar2) { 'http://www.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
let!(:tomato) { FactoryBot.create :tomato, creator: someone_else }
let!(:tomato) { FactoryBot.create :tomato, creator: someone_else }
before do
{
chard: 'https://farm9.staticflickr.com/8516/8519911893_1759c28965_q.jpg',