Merge pull request #760 from integer32llc/run-on-m1

Author: shepmaster

tests/spec/features/highlighting_mir_output_spec.rb

@@ -12,8 +12,6 @@
   end
 
   scenario "error locations are links" do
-    pending "Double notifications block the text to click on"
-
     within(:output, :mir) do
       click_link('src/main.rs:4:14: 4:19', match: :first)
     end

tests/spec/spec_helper.rb

@@ -58,7 +58,7 @@
 Capybara.default_driver = Capybara.javascript_driver = :firefox
 Capybara.app_host = "http://#{ADDRESS}:#{PORT}"
 Capybara.run_server = false
-Capybara.default_max_wait_time = 5
+Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_WAIT', 5).to_f
 Capybara.automatic_label_click = true
 
 Capybara::Screenshot.register_driver(:firefox) do |driver, path|

ui/src/sandbox.rs

@@ -439,6 +439,8 @@ macro_rules! docker_command {
 fn basic_secure_docker_command() -> Command {
     let mut cmd = docker_command!(
         "run",
+        "--platform",
+        "linux/amd64",
         "--detach",
         "--cap-drop=ALL",
         // Needed to allow overwriting the file