some refactoring

spec/lib/docker_client_spec.rb

@@ -118,15 +118,14 @@ describe DockerClient, docker: true do
     end
   end
 
-  describe '#create_workspace' do
+  describe '#create_workspace_files' do
     let(:container) { double }
 
     before(:each) do
-      docker_client.instance_variable_set(:@submission, submission)
       expect(container).to receive(:binds).at_least(:once).and_return(["#{workspace_path}:#{DockerClient::CONTAINER_WORKSPACE_PATH}"])
     end
 
-    after(:each) { docker_client.send(:create_workspace, container) }
+    after(:each) { docker_client.send(:create_workspace_files, container, submission) }
 
     it 'creates submission-specific directories' do
       expect(Dir).to receive(:mkdir).at_least(:once)
@@ -233,8 +232,8 @@ describe DockerClient, docker: true do
       expect(DockerContainerPool).to receive(:get_container).with(submission.execution_environment).and_call_original
     end
 
-    it 'creates the workspace' do
-      expect(docker_client).to receive(:create_workspace)
+    it 'creates the workspace files' do
+      expect(docker_client).to receive(:create_workspace_files)
     end
 
     it 'executes the run command' do
@@ -251,8 +250,8 @@ describe DockerClient, docker: true do
       expect(DockerContainerPool).to receive(:get_container).with(submission.execution_environment).and_call_original
     end
 
-    it 'creates the workspace' do
-      expect(docker_client).to receive(:create_workspace)
+    it 'creates the workspace files' do
+      expect(docker_client).to receive(:create_workspace_files)
     end
 
     it 'executes the test command' do

spec/lib/docker_container_mixin_spec.rb

@@ -1,18 +1,30 @@
 require 'rails_helper'
 
 describe DockerContainerMixin do
-  [:binds, :port_bindings].each do |method|
-    describe "##{method}" do
-      let(:data) { [] }
+  describe '#binds' do
+    let(:binds) { [] }
 
-      it 'is defined for Docker::Container' do
-        expect(Docker::Container.instance_methods).to include(method)
-      end
+    it 'is defined for Docker::Container' do
+      expect(Docker::Container.instance_methods).to include(:binds)
+    end
 
-      it 'returns the correct information' do
-        expect(CONTAINER).to receive(:json).and_return('HostConfig' => {method.to_s.camelize => data})
-        expect(CONTAINER.send(method)).to eq(data)
-      end
+    it 'returns the correct information' do
+      expect(CONTAINER).to receive(:json).and_return('HostConfig' => {'Binds' => binds})
+      expect(CONTAINER.binds).to eq(binds)
+    end
+  end
+
+  describe '#port_bindings' do
+    let(:port) { 1234 }
+    let(:port_bindings) { {"#{port}/tcp" => [{'HostIp' => '', 'HostPort' => port.to_s}]} }
+
+    it 'is defined for Docker::Container' do
+      expect(Docker::Container.instance_methods).to include(:port_bindings)
+    end
+
+    it 'returns the correct information' do
+      expect(CONTAINER).to receive(:json).and_return('HostConfig' => {'PortBindings' => port_bindings})
+      expect(CONTAINER.port_bindings).to eq(port => port)
     end
   end
 end