Merge pull request #701 from integer32llc/css-modules

Author: shepmaster

ci/workflows.yml

@@ -336,6 +336,10 @@ workflows:
             run: >-
               yarn --cwd ui/frontend/ test:lint
 
+          - name: "Style"
+            run: >-
+              yarn --cwd ui/frontend/ test:style
+
           - name: "Build frontend"
             run: >-
               yarn --cwd ui/frontend/ run build:production

tests/Gemfile.lock

@@ -18,9 +18,9 @@ GEM
     diff-lcs (1.4.4)
     launchy (2.5.0)
       addressable (~> 2.7)
-    mini_mime (1.0.2)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     public_suffix (4.0.6)

tests/spec/features/assistance_spec.rb

@@ -13,13 +13,11 @@
     EOF
     click_on("Build")
 
-    within('.output-warning') do
+    within(:output, :warning) do
       click_on("add a main function")
     end
 
-    within('.editor') do
-      expect(editor).to have_line 'println!("Hello, world!")'
-    end
+    expect(editor).to have_line 'println!("Hello, world!")'
   end
 
   scenario "using an unstable feature offers adding the feature flag" do
@@ -29,13 +27,11 @@
     EOF
     click_on("Build")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       click_on("add `#![feature(abi_avr_interrupt)]`")
     end
 
-    within('.editor') do
-      expect(editor).to have_line '#![feature(abi_avr_interrupt)]'
-    end
+    expect(editor).to have_line '#![feature(abi_avr_interrupt)]'
   end
 
   scenario "using a type that hasn't been imported offers importing it" do
@@ -44,13 +40,11 @@
     EOF
     click_on("Build")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       click_on("use std::collections::HashMap;")
     end
 
-    within('.editor') do
-      expect(editor).to have_line 'use std::collections::HashMap;'
-    end
+    expect(editor).to have_line 'use std::collections::HashMap;'
   end
 
   scenario "triggering a panic offers enabling backtraces" do
@@ -61,11 +55,11 @@
     EOF
     click_on("Run")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       click_on("run with `RUST_BACKTRACE=1` environment variable to display a backtrace")
     end
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content("stack backtrace:")
     end
   end

tests/spec/features/automatic_primary_action_spec.rb

@@ -13,7 +13,7 @@
     EOF
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'Hello, world'
     end
   end
@@ -27,7 +27,7 @@
     EOF
     click_on("Build")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content 'function is never used: `main`'
     end
   end
@@ -47,7 +47,7 @@
     EOF
     click_on("Build")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content 'function is never used: `main`'
     end
   end
@@ -59,7 +59,7 @@
     EOF
     click_on("Test")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'running 1 test'
       expect(page).to have_content 'test awesome ... ok'
       expect(page).to have_content 'test result: ok'
@@ -79,7 +79,7 @@
     EOF
     click_on("Test")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'running 1 test'
       expect(page).to_not have_content 'Running in main'
     end
@@ -93,7 +93,7 @@
     EOF
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'Running in main'
     end
   end
@@ -106,7 +106,7 @@
     EOF
     click_on("Build")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content 'function is never used: `arbitrary_code`'
     end
   end

tests/spec/features/backtrace_spec.rb

@@ -13,18 +13,18 @@
   context "backtraces are enabled" do
     before do
       in_advanced_options_menu { choose 'enabled' }
-      within('.header') { click_on("Run") }
+      within(:header) { click_on("Run") }
     end
 
     scenario "a backtrace is shown" do
-      within('.output-stderr') do
+      within(:output, :stderr) do
         expect(page).to have_content 'stack backtrace:'
         expect(page).to have_content 'rust_begin_unwind'
       end
     end
 
     scenario "filenames link to that line of code" do
-      within('.output-stderr') do
+      within(:output, :stderr) do
         expect(page).to have_link('main.rs:2')
         expect(page).to have_link('main.rs:6')
       end
@@ -33,11 +33,11 @@
 
   context "backtraces are disabled" do
     before do
-      within('.header') { click_on("Run") }
+      within(:header) { click_on("Run") }
     end
 
     scenario "the backtrace suggestion is a link" do
-      within('.output-stderr') do
+      within(:output, :stderr) do
         expect(page).to have_link(text: /Run with .* a backtrace/i)
       end
     end

tests/spec/features/compilation_modes_spec.rb

@@ -14,7 +14,7 @@
     in_mode_menu { click_on("Debug") }
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'Compiling in debug mode'
       expect(page).to_not have_content 'Compiling in release mode'
     end
@@ -24,7 +24,7 @@
     in_mode_menu { click_on("Release") }
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to_not have_content 'Compiling in debug mode'
       expect(page).to have_content 'Compiling in release mode'
     end

tests/spec/features/compilation_targets_spec.rb

@@ -22,21 +22,21 @@
 
     scenario "choosing to run the code" do
       in_build_menu { click_on(build_button: "Run") }
-      within('.output-stdout') do
+      within(:output, :stdout) do
         expect(page).to have_content 'Hello, world!'
       end
     end
 
     scenario "choosing to build the code" do
       in_build_menu { click_on(build_button: "Build") }
-      within('.output-stderr') do
+      within(:output, :stderr) do
         expect(page).to have_content 'function is never used: `main`'
       end
     end
 
     scenario "choosing to test the code" do
       in_build_menu { click_on(build_button: "Test") }
-      within('.output-stdout') do
+      within(:output, :stdout) do
         expect(page).to have_content "panicked at 'assertion failed: false'"
       end
     end
@@ -50,7 +50,7 @@
     scenario "compiling to assembly" do
       in_build_menu { click_on("assembly") }
 
-      within('.output-code') do
+      within(:output, :code) do
         # We demangle the symbols
         expect(page).to have_content 'playground::main:'
 
@@ -67,7 +67,7 @@
     scenario "compiling to assembly" do
       in_build_menu { click_on("assembly") }
 
-      within('.output-code') do
+      within(:output, :code) do
         # We demangle the symbols
         expect(page).to have_content 'playground::main:'
 
@@ -79,7 +79,7 @@
   scenario "compiling to LLVM IR" do
     in_build_menu { click_on("LLVM IR") }
 
-    within('.output-code') do
+    within(:output, :code) do
       expect(page).to have_content 'ModuleID'
       expect(page).to have_content 'target datalayout'
       expect(page).to have_content 'target triple'
@@ -89,7 +89,7 @@
   scenario "compiling to MIR" do
     in_build_menu { click_on("MIR") }
 
-    within('.output-result') do
+    within(:output, :result) do
       expect(page).to have_content 'StorageLive'
       expect(page).to have_content 'StorageDead'
     end
@@ -102,15 +102,15 @@
 
     in_build_menu { click_on("HIR") }
 
-    within('.output-result') do
+    within(:output, :result) do
       expect(page).to have_content 'fn demo() -> /*impl Trait*/ { 42 }'
     end
   end
 
   scenario "compiling to WebAssembly" do
     in_build_menu { click_on("WASM") }
 
-    within('.output-code') do
+    within(:output, :code) do
       expect(page).to have_content '(module'
       expect(page).to have_content '(block'
     end
@@ -122,7 +122,7 @@
     scenario "it shows the compilation error" do
       in_build_menu { click_on("MIR") }
 
-      within('.output-stderr') do
+      within(:output, :stderr) do
         expect(page).to have_content 'an unclosed delimiter'
       end
     end

tests/spec/features/editions_spec.rb

@@ -14,7 +14,7 @@
     in_advanced_options_menu { choose '2015' }
     click_on("Run")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content 'unused variable: `async`'
       expect(page).to_not have_content 'expected identifier, found keyword `async`'
     end
@@ -24,7 +24,7 @@
     in_advanced_options_menu { choose '2018' }
     click_on("Run")
 
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_content 'expected identifier, found keyword `async`'
       expect(page).to_not have_content 'unused variable: `async`'
     end

tests/spec/features/editor_types_spec.rb

@@ -13,7 +13,7 @@
 
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'simple editor'
     end
   end

tests/spec/features/highlighting_error_output_spec.rb

@@ -5,31 +5,31 @@
   before do
     visit '/'
     editor.set(code)
-    within('.header') { click_on("Run") }
+    within(:header) { click_on("Run") }
   end
 
   scenario "errors are highlighted" do
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_css '.error', text: '1 type argument but 2 type arguments were supplied'
       expect(page).to have_css '.error', text: 'aborting due to 2 previous errors'
       expect(page).to have_css '.error', text: /Could not compile `playground`/i
     end
   end
 
   scenario "error locations are links" do
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_link('src/main.rs')
     end
   end
 
   scenario "github see-issues are links" do
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_link('see issue #23416 <https://github.com/rust-lang/rust/issues/23416>', href: 'https://github.com/rust-lang/rust/issues/23416')
     end
   end
 
   scenario "error codes link to the error page" do
-    within('.output-stderr') do
+    within(:output, :stderr) do
       expect(page).to have_link('E0107', href: /error-index.html#E0107/)
     end
   end

tests/spec/features/highlighting_mir_output_spec.rb

@@ -12,7 +12,7 @@
   end
 
   scenario "error locations are links" do
-    within('.output-mir') do
+    within(:output, :mir) do
       click_link('src/main.rs:4:14: 4:19', match: :first)
     end
     expect(editor).to have_highlighted_text('a + b')

tests/spec/features/multiple_channels_spec.rb

@@ -14,7 +14,7 @@
     in_channel_menu { click_on("Stable") }
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'rustc'
       expect(page).to_not have_content 'beta'
       expect(page).to_not have_content 'nightly'
@@ -25,7 +25,7 @@
     in_channel_menu { click_on("Beta") }
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'rustc'
       expect(page).to have_content 'beta'
       expect(page).to_not have_content 'nightly'
@@ -36,7 +36,7 @@
     in_channel_menu { click_on("Nightly") }
     click_on("Run")
 
-    within('.output-stdout') do
+    within(:output, :stdout) do
       expect(page).to have_content 'rustc'
       expect(page).to_not have_content 'beta'
       expect(page).to have_content 'nightly'

tests/spec/features/sharing_with_others_spec.rb

@@ -16,7 +16,7 @@
     in_mode_menu { click_on("Release") }
     in_advanced_options_menu { choose("2018") }
 
-    within('.header') { click_on 'Share' }
+    within(:header) { click_on 'Share' }
 
     # Save the links before we navigate away
     perma_link = find_link("Permalink to the playground")[:href]