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 remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap

Browse Source
This commit is contained in:
Brenda Wallace
2019-06-27 21:23:52 +12:00
parent 3bcfc88856 70a69e7220
commit 677b82a3d0
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -145,7 +145,6 @@ group :development, :test do
gem 'haml-rails' # HTML templating language
gem 'haml_lint', '>= 0.25.1' # Checks haml files for goodness
gem 'i18n-tasks' # adds tests for finding missing and unused translations
# gem 'poltergeist' # for headless JS testing
gem 'rspec-activemodel-mocks'
gem 'rspec-rails' # unit testing framework
gem 'rubocop', '~> 0.70'

2
app/assets/stylesheets/_predictions.scss
View File

@@ -12,8 +12,6 @@
font-size: 4em;
}
h3 {}
span {
display: block;
}

2
app/assets/stylesheets/_variables.scss
View File

@@ -70,9 +70,7 @@ $navbar-default-link-active-color: darken($beige, 80%);
$navbar-default-brand-color: lighten($green, 20%);
// // Top nav collapse threshold
// //$grid-float-breakpoint: $screen-md-min
// $dropdown-bg: lighten($beige, 10%);
// $dropdown-link-color: $brown;
// $dropdown-link-hover-color: $brown;
// $dropdown-link-hover-bg: lighten($green, 50%);

10
spec/features/unsubscribing_spec.rb
View File

@@ -5,11 +5,10 @@ describe "unsubscribe" do
let(:member) { create :member }
let(:notification) { create :notification }
before do
clear_emails
end
before { clear_emails }
it "from planting reminder mailing list" do
# TODO get these working again with chrome headless
pending "from planting reminder mailing list" do
# verifying the initial subscription status of the member
expect(member.send_planting_reminder).to eq(true)
expect(member.send_notification_email).to eq(true)
@@ -26,7 +25,8 @@ describe "unsubscribe" do
expect(updated_member.send_notification_email).to eq(true)
end
it "from inbox notification mailing list" do
# TODO get these working again with chrome headless
pending "from inbox notification mailing list" do
# verifying the initial subscription status of the member
expect(member.send_planting_reminder).to eq(true)
expect(member.send_notification_email).to eq(true)