- 
+  %>)
+
Shell for Slack
Whoa, a bash shell inside Slack!
@@ -28,7 +28,7 @@
+  %>)
A little more play, a little more connection.
-
-
+  %>)
Strava in Slack
Share Strava activities, celebrate every finish, and keep your Slack team moving.
Meet Slava -
-
+  %>)
Strava in Discord
Bring your running or cycling club together with Strava activities in Discord.
Meet Strada -
-
+  %>)
S'Up for Slack
Meet someone new over coffee with fresh groups of three from your Slack channel each week.
Meet S'Up -
-
+  %>)
Leaderboards in Slack
Challenge teammates, report scores, and climb your Slack channel's leaderboard.
Meet Gamebot diff --git a/public/partials/_head.html.erb b/public/partials/_head.html.erb index 95e1cf8..ec49cf3 100644 --- a/public/partials/_head.html.erb +++ b/public/partials/_head.html.erb @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/public/styles.css b/public/styles.css.erb similarity index 97% rename from public/styles.css rename to public/styles.css.erb index 8062f43..d51752b 100644 --- a/public/styles.css +++ b/public/styles.css.erb @@ -25,7 +25,7 @@ body { z-index: -1; content: ""; pointer-events: none; - background: linear-gradient(#ffffff66, #ffffff66), url("/img/screenshot-background.svg") center top / 100% 100% no-repeat; + background: linear-gradient(#ffffff66, #ffffff66), url("<%= asset_path('/img/screenshot-background.svg') %>") center top / 100% 100% no-repeat; } .site-page > main { flex: 1; } diff --git a/spec/integration/index_spec.rb b/spec/integration/index_spec.rb index 3d1d1be..b0bba8b 100644 --- a/spec/integration/index_spec.rb +++ b/spec/integration/index_spec.rb @@ -23,6 +23,13 @@ expect(page).to have_css('#is-this-a-joke p', text: 'Yes. Also, it works!') end + it 'loads the generated stylesheet and versioned artwork after a reload' do + page.refresh + background = page.evaluate_script("getComputedStyle(document.body, '::before').backgroundImage") + expect(background).to match(%r{/img/screenshot-background\.svg\?v=[a-f0-9]{64}}) + expect(page).to have_css('.hero-preview img') { |image| image.evaluate_script('this.complete && this.naturalWidth > 0') } + end + it 'links to the bot recommendations after How to use in navigation' do expect(page).to have_css('.nav-links a[href="/#how-to-use"] + a[href="/#more-bots"]', text: /More bots/i) within('nav') { click_link 'More bots' } diff --git a/spec/slack_ruby_bot_server/api/middleware_spec.rb b/spec/slack_ruby_bot_server/api/middleware_spec.rb index 00d2b14..6bad8f2 100644 --- a/spec/slack_ruby_bot_server/api/middleware_spec.rb +++ b/spec/slack_ruby_bot_server/api/middleware_spec.rb @@ -12,12 +12,52 @@ expect(JSON.parse(last_response.body)).to include('type' => 'other_error', 'message' => '405 Not Allowed') end + describe 'website asset caching' do + ['/', '/help.html', '/privacy.html'].each do |path| + it "serves #{path} with versioned local assets and a revalidating cache policy" do + get path + + assets = Capybara.string(last_response.body).all('script[src^="/"], link[href^="/"], img[src^="/"]', visible: :all) + expect(assets).not_to be_empty + expect(assets.map { |asset| asset[:src] || asset[:href] }).to all(match(/\?v=[a-f0-9]{64}\z/)) + expect(last_response.headers['Cache-Control']).to eq 'private, no-cache' + end + end + + it 'renders a revalidating stylesheet with a versioned background image' do + get '/styles.css' + + expect(last_response.content_type).to eq 'text/css; charset=utf-8' + expect(last_response.headers['Cache-Control']).to eq 'private, no-cache' + expect(last_response.body).to include("/img/screenshot-background.svg?v=#{Digest::SHA256.file('public/img/screenshot-background.svg').hexdigest}") + end + + it 'revalidates static assets using their content ETag' do + get '/scripts/shell.js' + etag = last_response.headers['ETag'] + expect(etag).to eq %("#{Digest::SHA256.file('public/scripts/shell.js').hexdigest}") + + get '/scripts/shell.js', {}, 'HTTP_IF_NONE_MATCH' => etag + expect(last_response.status).to eq 304 + expect(last_response.body).to be_empty + end + + it 'returns the asset for an old ETag even when its timestamp matches' do + get '/scripts/shell.js', {}, 'HTTP_IF_NONE_MATCH' => '"old-content"', + 'HTTP_IF_MODIFIED_SINCE' => File.mtime('public/scripts/shell.js').httpdate + + expect(last_response.status).to eq 200 + expect(last_response.body).to eq File.read('public/scripts/shell.js') + end + end + context 'when a health check fails' do let(:team) { Fabricate(:team) } + let(:slack_client) { instance_double(Slack::Web::Client) } before do - allow(Team).to receive(:asc).with(:_id).and_return([team]) - allow(team).to receive(:ping!).and_raise(StandardError, 'Slack ping failed') + allow(Slack::Web::Client).to receive(:new).with(token: team.token).and_return(slack_client) + allow(slack_client).to receive(:auth_test).and_raise(StandardError, 'Slack ping failed') end it 'preserves the original failure in the error response' do @@ -26,5 +66,17 @@ expect(last_response.status).to eq 400 expect(JSON.parse(last_response.body)).to include('type' => 'other_error', 'message' => 'Slack ping failed') end + + it 'deactivates revoked installations and returns an explicit failed ping' do + allow(slack_client).to receive(:auth_test).and_raise(Slack::Web::Api::Errors::SlackError, 'account_inactive') + get '/api/status' + + expect(last_response.status).to eq 200 + expect(JSON.parse(last_response.body)).to include( + 'ping' => { 'ok' => false, 'error' => 'account_inactive' }, + 'active_teams_count' => 0 + ) + expect(team.reload.active).to be false + end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 90a37a0..566d67d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,8 +3,8 @@ ENV['RACK_ENV'] = 'test' Bundler.require :default, ENV['RACK_ENV'] +require_relative '../app' + Dir[File.join(File.dirname(__FILE__), 'support', '**/*.rb')].each do |file| require file end - -require_relative '../app'